From: Ingo Molnar <mingo@elte.hu>

show held locks when printing a backtrace.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/traps.c   |    1 +
 arch/x86_64/kernel/traps.c |    1 +
 2 files changed, 2 insertions(+)

diff -puN arch/i386/kernel/traps.c~lockdep-show-held-locks-when-showing-a-stackdump arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c~lockdep-show-held-locks-when-showing-a-stackdump
+++ a/arch/i386/kernel/traps.c
@@ -266,6 +266,7 @@ static void show_stack_log_lvl(struct ta
 	}
 	printk("\n%sCall Trace:\n", log_lvl);
 	show_trace_log_lvl(task, regs, esp, log_lvl);
+	debug_show_held_locks(task);
 }
 
 void show_stack(struct task_struct *task, unsigned long *esp)
diff -puN arch/x86_64/kernel/traps.c~lockdep-show-held-locks-when-showing-a-stackdump arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c~lockdep-show-held-locks-when-showing-a-stackdump
+++ a/arch/x86_64/kernel/traps.c
@@ -362,6 +362,7 @@ show_trace(struct task_struct *tsk, stru
 	printk("\nCall Trace:\n");
 	dump_trace(tsk, regs, stack, &print_trace_ops, NULL);
 	printk("\n");
+	debug_show_held_locks(tsk);
 }
 
 static void
_