* [PATCH] rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif
@ 2018-09-11 1:46 Steven Rostedt
2018-09-11 6:22 ` [tip:locking/core] locking/rtmutex: " tip-bot for Steven Rostedt (VMware)
0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2018-09-11 1:46 UTC (permalink / raw)
To: LKML; +Cc: Ingo Molnar, Thomas Gleixner, Peter Zijlstra, Peter Rosin
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
*
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:locking/core] locking/rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif
2018-09-11 1:46 [PATCH] rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif Steven Rostedt
@ 2018-09-11 6:22 ` tip-bot for Steven Rostedt (VMware)
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Steven Rostedt (VMware) @ 2018-09-11 6:22 UTC (permalink / raw)
To: linux-tip-commits
Cc: peda, torvalds, peterz, hpa, mingo, tglx, rostedt, linux-kernel
Commit-ID: 84818af26350c245c8e1994493b7459c0822be5b
Gitweb: https://git.kernel.org/tip/84818af26350c245c8e1994493b7459c0822be5b
Author: Steven Rostedt (VMware) <rostedt@goodmis.org>
AuthorDate: Mon, 10 Sep 2018 21:46:38 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 11 Sep 2018 08:12:00 +0200
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
*
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-11 6:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-11 1:46 [PATCH] rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif Steven Rostedt
2018-09-11 6:22 ` [tip:locking/core] locking/rtmutex: " tip-bot for Steven Rostedt (VMware)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).