mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 08:07:32 -04:00
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
This commit is contained in:
commit
ac82a57aff
1 changed files with 2 additions and 0 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue