diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-12-06 23:37:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:36 -0500 |
commit | a4c410f00f7ca4bd448b0d63f6f882fd244dc991 (patch) | |
tree | 9384e64eda2ee317ceb7b02d1752459ce9fcb8c6 /kernel/sched.c | |
parent | 8bb0269160df2a60764013994d0bc5165406cf4a (diff) |
[PATCH] lockdep: print current locks on in_atomic warnings
Add debug_show_held_locks(current) to __might_sleep() and schedule(); this
makes finding the offending lock leak easier.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 1848e280504d..343e1794233e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -3333,6 +3333,7 @@ asmlinkage void __sched schedule(void) | |||
3333 | printk(KERN_ERR "BUG: scheduling while atomic: " | 3333 | printk(KERN_ERR "BUG: scheduling while atomic: " |
3334 | "%s/0x%08x/%d\n", | 3334 | "%s/0x%08x/%d\n", |
3335 | current->comm, preempt_count(), current->pid); | 3335 | current->comm, preempt_count(), current->pid); |
3336 | debug_show_held_locks(current); | ||
3336 | dump_stack(); | 3337 | dump_stack(); |
3337 | } | 3338 | } |
3338 | profile_hit(SCHED_PROFILING, __builtin_return_address(0)); | 3339 | profile_hit(SCHED_PROFILING, __builtin_return_address(0)); |
@@ -6872,6 +6873,7 @@ void __might_sleep(char *file, int line) | |||
6872 | " context at %s:%d\n", file, line); | 6873 | " context at %s:%d\n", file, line); |
6873 | printk("in_atomic():%d, irqs_disabled():%d\n", | 6874 | printk("in_atomic():%d, irqs_disabled():%d\n", |
6874 | in_atomic(), irqs_disabled()); | 6875 | in_atomic(), irqs_disabled()); |
6876 | debug_show_held_locks(current); | ||
6875 | dump_stack(); | 6877 | dump_stack(); |
6876 | } | 6878 | } |
6877 | #endif | 6879 | #endif |