From 2fb306f76426a63c664bb4493abdc656e3b71bed Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Wed, 6 Feb 2013 10:56:19 -0800 Subject: [PATCH] --- yaml --- r: 356284 b: refs/heads/master c: c0540606837af79b2ae101e5e7b2206e3844d150 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/lockdep.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 66e2644782fb..1034793dc9f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce6711f3d196f09ca0ed29a24dfad42d83912b20 +refs/heads/master: c0540606837af79b2ae101e5e7b2206e3844d150 diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 5cf12e791603..8a0efac4f99d 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -3190,9 +3190,14 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, #endif if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) { debug_locks_off(); - printk("BUG: MAX_LOCK_DEPTH too low!\n"); + printk("BUG: MAX_LOCK_DEPTH too low, depth: %i max: %lu!\n", + curr->lockdep_depth, MAX_LOCK_DEPTH); printk("turning off the locking correctness validator.\n"); + + lockdep_print_held_locks(current); + debug_show_all_locks(); dump_stack(); + return 0; }