diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-16 15:43:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-16 15:43:19 -0700 |
| commit | ac82a57aff853599db757f666204ac8d2af4b26b (patch) | |
| tree | 59a27cd9f21a4b84ca096778c6ed3afd868a75dd | |
| parent | e2f50c5c6cd8dcfda30b8d656fe213f7e285c54a (diff) | |
| parent | 5c8a010c2411729a07cb1b90c09fa978ac0ac6c0 (diff) | |
| download | linaro-android-ac82a57aff853599db757f666204ac8d2af4b26b.tar.gz | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixlet from Ingo Molnar:
"Fixes a build warning on certain Kconfig combinations"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/lockdep: Fix print_collision() unused warning
| -rw-r--r-- | kernel/locking/lockdep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 2324ba5310db..ed9410936a22 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -1999,6 +1999,7 @@ static inline int get_first_held_lock(struct task_struct *curr, return ++i; } +#ifdef CONFIG_DEBUG_LOCKDEP /* * Returns the next chain_key iteration */ @@ -2069,6 +2070,7 @@ static void print_collision(struct task_struct *curr, printk("\nstack backtrace:\n"); dump_stack(); } +#endif /* * Checks whether the chain and the current held locks are consistent |