Messages in this thread Patch in this message | | | Date | Mon, 10 Sep 2018 21:46:38 -0400 | From | Steven Rostedt <> | Subject | [PATCH] rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif |
| |
From: Steven Rostedt (VMware) <rostedt@goodmis.org>
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> --- diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 2823d4163a37..581edcc63c26 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -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 *
| |