diff options
| author |   Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-06-07 11:17:30 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2011-11-14 13:35:16 +0100 |
| commit | 94d24fc47219219b5aa23b45956cc37ee5aa5b01 (patch) | |
| tree | cc7f5fbf4f2e9c6243c9b3ce2439c2d3807d5f12 /kernel/printk.c | |
| parent | Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| download | linux-dev-94d24fc47219219b5aa23b45956cc37ee5aa5b01.tar.xz linux-dev-94d24fc47219219b5aa23b45956cc37ee5aa5b01.zip | |
printk, lockdep: Disable lock debugging on zap_locks()
zap_locks() is used by printk() in a last ditch effort to get data
out, clearly we cannot trust lock state after this so make it disable
lock debugging.
Also don't treat printk recursion through lockdep as a normal
recursion bug but try hard to get the lockdep splat out.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-kqxwmo4xz37e1s8w0xopvr0q@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 1455a0d4eedd..6d087944e72a 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -688,6 +688,7 @@ static void zap_locks(void) oops_timestamp = jiffies; + debug_locks_off(); /* If a crash is occurring, make sure we can't deadlock */ raw_spin_lock_init(&logbuf_lock); /* And make sure that we print immediately */ @@ -856,7 +857,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) * recursion and return - but flag the recursion so that * it can be printed at the next appropriate moment: */ - if (!oops_in_progress) { + if (!oops_in_progress && !lockdep_recursing(current)) { recursion_bug = 1; goto out_restore_irqs; } |