]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit - kernel/locking/rtmutex.c
locking/rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Tue, 11 Sep 2018 01:46:38 +0000 (21:46 -0400)
committerIngo Molnar <mingo@kernel.org>
Tue, 11 Sep 2018 06:12:00 +0000 (08:12 +0200)
commit84818af26350c245c8e1994493b7459c0822be5b
treebc0d979006c5ee52f6cba5be82949123c16355f7
parent925b9cd1b89a94b7124d128c80dfc48f78a63098
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>
kernel/locking/rtmutex.c