diff options
| author | Jarek Poplawski <jarkao2@o2.pl> | 2007-03-22 00:11:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:39:06 -0700 |
| commit | 9c35dd7f8bda1849dcb430be99325504221048df (patch) | |
| tree | 0c1d8eef5af9e21bf9c552f13646710f57b97f23 /kernel | |
| parent | b43376927ab0f7b64c4fb304568ecfaea10446e2 (diff) | |
| download | kernel_samsung_smdk4412-9c35dd7f8bda1849dcb430be99325504221048df.zip kernel_samsung_smdk4412-9c35dd7f8bda1849dcb430be99325504221048df.tar.gz kernel_samsung_smdk4412-9c35dd7f8bda1849dcb430be99325504221048df.tar.bz2 | |
[PATCH] lockdep: debug_show_all_locks & debug_show_held_locks vs. debug_locks
lockdep's data shouldn't be used when debug_locks == 0 because it's not
updated after this, so it's more misleading than helpful.
PS: probably lockdep's current-> fields should be reset after it turns
debug_locks off: so, after printing a bug report, but before return from
exported functions, but there are really a lot of these possibilities (e.g.
after DEBUG_LOCKS_WARN_ON), so, something could be missed. (Of course
direct use of this fields isn't recommended either.)
Reported-by: Folkert van Heusden <folkert@vanheusden.com>
Inspired-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/lockdep.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 8dc24c9..7065a68 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -2742,6 +2742,10 @@ void debug_show_all_locks(void) int count = 10; int unlock = 1; + if (unlikely(!debug_locks)) { + printk("INFO: lockdep is turned off.\n"); + return; + } printk("\nShowing all locks held in the system:\n"); /* @@ -2785,6 +2789,10 @@ EXPORT_SYMBOL_GPL(debug_show_all_locks); void debug_show_held_locks(struct task_struct *task) { + if (unlikely(!debug_locks)) { + printk("INFO: lockdep is turned off.\n"); + return; + } lockdep_print_held_locks(task); } |