From: Heiko Carstens Date: Mon, 4 Dec 2006 14:40:47 +0000 (+0100) Subject: [S390] lockdep: show held locks when showing a stackdump X-Git-Tag: v2.6.20-rc2~6^2~13^2~20^2~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=236257eee99a35d67d3feab0769bded83efdc3ec;p=linux-2.6-omap-h63xx.git [S390] lockdep: show held locks when showing a stackdump Follow i386/x86_64: lockdep can be used to print held locks when printing a backtrace. This can be useful when debugging things like 'scheduling while atomic' asserts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index 475dbb88443..3cbb0dcf1f1 100644 --- a/arch/s390/kernel/traps.c +++ b/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)