From 8005e1a798e1c66daef2a7ae31252c13ae4e252f Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 19 Jun 2007 13:10:05 +0200 Subject: [PATCH] --- yaml --- r: 57871 b: refs/heads/master c: bca0fb8683b7406d3056dc53a14b0a482c367e2b h: refs/heads/master i: 57869: 1301ce51089eae7caa668441508a3118b5fd8dde 57867: 812d6d2b8276763882807e1e3c31effdfbf6f040 57863: 1a402122bb8d2cc6bdfbdddf94d12ac71c7a8f1a 57855: 67805f9ec90563f68e9f09b1730acb228cb55abe v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/traps.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0db63920f75a..e60bb40cd6fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fc9bbf771ce7d41ed33300e75e74e922dde1c38 +refs/heads/master: bca0fb8683b7406d3056dc53a14b0a482c367e2b diff --git a/trunk/arch/s390/kernel/traps.c b/trunk/arch/s390/kernel/traps.c index 1d8c92740ccd..ee9186f8fb08 100644 --- a/trunk/arch/s390/kernel/traps.c +++ b/trunk/arch/s390/kernel/traps.c @@ -253,20 +253,22 @@ void die(const char * str, struct pt_regs * regs, long err) { static int die_counter; + oops_enter(); debug_stop_all(); console_verbose(); spin_lock_irq(&die_lock); bust_spinlocks(1); printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); print_modules(); - show_regs(regs); + show_regs(regs); bust_spinlocks(0); - spin_unlock_irq(&die_lock); + spin_unlock_irq(&die_lock); if (in_interrupt()) panic("Fatal exception in interrupt"); if (panic_on_oops) panic("Fatal exception: panic_on_oops"); - do_exit(SIGSEGV); + oops_exit(); + do_exit(SIGSEGV); } static void inline