linux-kernel - [tip:locking/core] locking/rtmutex: Fix the preprocessor logic with normal #ifdef #else #endif

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-84818af26350c245c8e1994493b7459c0822be5b@git.kernel.org>
Date:   Mon, 10 Sep 2018 23:22:54 -0700
From:   "tip-bot for Steven Rostedt (VMware)" <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     peda@...ntia.se, torvalds@...ux-foundation.org,
        peterz@...radead.org, hpa@...or.com, mingo@...nel.org,
        tglx@...utronix.de, rostedt@...dmis.org,
        linux-kernel@...r.kernel.org
Subject: [tip:locking/core] locking/rtmutex: Fix the preprocessor logic with
 normal #ifdef #else #endif

Commit-ID:  84818af26350c245c8e1994493b7459c0822be5b
Gitweb:     https://git.kernel.org/tip/84818af26350c245c8e1994493b7459c0822be5b
Author:     Steven Rostedt (VMware) <rostedt@...dmis.org>
AuthorDate: Mon, 10 Sep 2018 21:46:38 -0400
Committer:  Ingo Molnar <mingo@...nel.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@...dmis.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Rosin <peda@...ntia.se>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/20180910214638.55926030@vmware.local.home
Signed-off-by: Ingo Molnar <mingo@...nel.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
  *