This commit was manufactured by cvs2svn to create branch

[linux-2.6.git] / arch / s390 / kernel / traps.c

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 6614d4b..cbe2ffb 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -243,12 +243,17 @@ void die(const char * str, struct pt_regs * regs, long err)
        bust_spinlocks(1);
        printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
         show_regs(regs);
+       if (netdump_func)
+               netdump_func(regs);
        bust_spinlocks(0);
         spin_unlock_irq(&die_lock);
        if (in_interrupt())
                panic("Fatal exception in interrupt");
-       if (panic_on_oops)
+       if (panic_on_oops) {
+               if (netdump_func)
+                        netdump_func = NULL;
                panic("Fatal exception: panic_on_oops");
+       }
         do_exit(SIGSEGV);
 }