Sfoglia il codice sorgente

locking/rtmutex: Don't initialize lockdep when not required

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>
Levin, Alexander (Sasha Levin) 8 anni fa
parent
commit
cde50a6739
1 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 2 1
      kernel/locking/rtmutex.c

+ 2 - 1
kernel/locking/rtmutex.c

@@ -1661,7 +1661,8 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name,
 	lock->waiters = RB_ROOT;
 	lock->waiters = RB_ROOT;
 	lock->waiters_leftmost = NULL;
 	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);
 EXPORT_SYMBOL_GPL(__rt_mutex_init);