diff options
| author | Linus Torvalds <[email protected]> | 2016-04-28 19:59:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-04-28 19:59:17 -0700 |
| commit | 2113caed87dd372e5ca2d9b3cba415f4da38936b (patch) | |
| tree | a8ce1b6b1653323e11d7152f2900f66bbd4bdca4 /kernel/locking/lockdep_proc.c | |
| parent | 8f3603a210970d665e7cecf6623331ce6b24f713 (diff) | |
| parent | 75dd602a5198a6e5f75534db52b6e6fbaabb33d1 (diff) | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Two lockdep fixes"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
lockdep: Fix lock_chain::base size
locking/lockdep: Fix ->irq_context calculation
Diffstat (limited to 'kernel/locking/lockdep_proc.c')
| -rw-r--r-- | kernel/locking/lockdep_proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index dbb61a302548..a0f61effad25 100644 --- a/kernel/locking/lockdep_proc.c +++ b/kernel/locking/lockdep_proc.c @@ -141,6 +141,8 @@ static int lc_show(struct seq_file *m, void *v) int i; if (v == SEQ_START_TOKEN) { + if (nr_chain_hlocks > MAX_LOCKDEP_CHAIN_HLOCKS) + seq_printf(m, "(buggered) "); seq_printf(m, "all lock chains:\n"); return 0; } |