From 30b8596e01ee84631f37252e54a22d37c556d0f3 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 6 Dec 2006 11:07:51 +0900
Subject: [PATCH] --- yaml --- r: 42611 b: refs/heads/master c:
 9b8c90eb0d916f6802f8bbac79f61aca6ac533e8 h: refs/heads/master i:   42609:
 5599e06c5ce9ce380d84c91337d12bd697e4458c   42607:
 a71b96fe4d06b18429c5af38c60a0a8e98ac4c5e v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/kernel/traps.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3fd04a93c6f9..5aca263b124d 100644
--- 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
index 0ee298079d82..3762d9dc2046 100644
--- 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)