---

yaml --- r: 42833 b: refs/heads/master c: a4c410f h: refs/heads/master i: 42831: a8a4703 v: v3
git-mirror · Dec 7, 2006 · b5e2571 · b5e2571
1 parent 7352c8b
commit b5e2571
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bb0269160df2a60764013994d0bc5165406cf4a
+refs/heads/master: a4c410f00f7ca4bd448b0d63f6f882fd244dc991
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -3333,6 +3333,7 @@ asmlinkage void __sched schedule(void)
 		printk(KERN_ERR "BUG: scheduling while atomic: "
 			"%s/0x%08x/%d\n",
 			current->comm, preempt_count(), current->pid);
+		debug_show_held_locks(current);
 		dump_stack();
 	}
 	profile_hit(SCHED_PROFILING, __builtin_return_address(0));
@@ -6872,6 +6873,7 @@ void __might_sleep(char *file, int line)
 				" context at %s:%d\n", file, line);
 		printk("in_atomic():%d, irqs_disabled():%d\n",
 			in_atomic(), irqs_disabled());
+		debug_show_held_locks(current);
 		dump_stack();
 	}
 #endif