locking/rtmutex: Don't initialize lockdep when not required
authorLevin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
Sun, 18 Jun 2017 14:06:01 +0000 (14:06 +0000)
committerIngo Molnar <mingo@kernel.org>
Tue, 20 Jun 2017 09:53:09 +0000 (11:53 +0200)
pi_mutex isn't supposed to be tracked by lockdep, but just
passing NULLs for name and key will cause lockdep to spew a
warning and die, which is not what we want it to do.

Skip lockdep initialization if the caller passed NULLs for
name and key, suggesting such initialization isn't desired.

Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: f5694788ad8d ("rt_mutex: Add lockdep annotations")
Link: http://lkml.kernel.org/r/20170618140548.4763-1-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/locking/rtmutex.c

index 43123533e9b100f09313ead15d22efb41abd8b0f..78069895032a9abb38fe19415a7faf3e7d01b884 100644 (file)
@@ -1661,7 +1661,8 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name,
        lock->waiters = RB_ROOT;
        lock->waiters_leftmost = NULL;
 
-       debug_rt_mutex_init(lock, name, key);
+       if (name && key)
+               debug_rt_mutex_init(lock, name, key);
 }
 EXPORT_SYMBOL_GPL(__rt_mutex_init);