Commit 84818af2 authored Sep 10, 2018 by Steven Rostedt (VMware) Committed by Ingo Molnar Sep 11, 2018

locking/rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif



Merging v4.14.68 into v4.14-rt I tripped over a conflict in the
rtmutex.c code. There I found that we had:

 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 [..]
 #endif

 #ifndef CONFIG_DEBUG_LOCK_ALLOC
 [..]
 #endif

Really this should be:

 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 [..]
 #else
 [..]
 #endif

This cleans up that logic.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Rosin <peda@axentia.se>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180910214638.55926030@vmware.local.home


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 925b9cd1

kernel/locking/rtmutex.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1485,9 +1485,9 @@ void __sched rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subclass)
		__rt_mutex_lock(lock, subclass);
		}
		EXPORT_SYMBOL_GPL(rt_mutex_lock_nested);
		#endif

		#ifndef CONFIG_DEBUG_LOCK_ALLOC
		#else /* !CONFIG_DEBUG_LOCK_ALLOC */

		/**
		* rt_mutex_lock - lock a rt_mutex
		*

Admin message