---

yaml --- r: 42611 b: refs/heads/master c: 9b8c90e h: refs/heads/master i: 42609: 5599e06 42607: a71b96f v: v3
git-mirror · Dec 6, 2006 · 30b8596 · 30b8596
1 parent a15d256
commit 30b8596
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c020e3dfb9429a3b31669a5ac2b86dd675c1ad2
+refs/heads/master: 9b8c90eb0d916f6802f8bbac79f61aca6ac533e8
diff --git a/trunk/arch/sh/kernel/traps.c b/trunk/arch/sh/kernel/traps.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/io.h>
+#include <linux/debug_locks.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
@@ -872,6 +873,11 @@ void show_trace(struct task_struct *tsk, unsigned long *sp,
 	}
 
 	printk("\n");
+
+	if (!tsk)
+		tsk = current;
+
+	debug_show_held_locks(tsk);
 }
 
 void show_stack(struct task_struct *tsk, unsigned long *sp)