---

yaml --- r: 42039 b: refs/heads/master c: 236257e h: refs/heads/master i: 42037: 3804d2b 42035: d822207 42031: 00f2f3e v: v3
git-mirror · Dec 4, 2006 · 826e122 · 826e122
1 parent c7d4870
commit 826e122
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59f35d53fde3987d071ea1c9bf1c9ba29fcb69fe
+refs/heads/master: 236257eee99a35d67d3feab0769bded83efdc3ec
diff --git a/trunk/arch/s390/kernel/traps.c b/trunk/arch/s390/kernel/traps.c
@@ -129,7 +129,7 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
 	}
 }
 
-void show_trace(struct task_struct *task, unsigned long * stack)
+void show_trace(struct task_struct *task, unsigned long *stack)
 {
 	register unsigned long __r15 asm ("15");
 	unsigned long sp;
@@ -151,6 +151,9 @@ void show_trace(struct task_struct *task, unsigned long * stack)
 		__show_trace(sp, S390_lowcore.thread_info,
 			     S390_lowcore.thread_info + THREAD_SIZE);
 	printk("\n");
+	if (!task)
+		task = current;
+	debug_show_held_locks(task);
 }
 
 void show_stack(struct task_struct *task, unsigned long *sp)