From 826e122c118a08ea27264972458f91e71944a993 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 4 Dec 2006 15:40:47 +0100 Subject: [PATCH] --- yaml --- r: 42039 b: refs/heads/master c: 236257eee99a35d67d3feab0769bded83efdc3ec h: refs/heads/master i: 42037: 3804d2bd45c633954a2743e4249e0569b59c45d9 42035: d8222075c8e7f2faac30af2c97b84dbfd1500fdf 42031: 00f2f3eb862733d58a44cb6497acda81444d78ef v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/traps.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1907a38cf6d2..1f071dd48654 100644 --- 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 index 475dbb884430..3cbb0dcf1f1d 100644 --- 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)