diff options
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 021f8fdc7512..0d4005dc06c5 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -453,11 +453,9 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
453 | if (in_interrupt()) | 453 | if (in_interrupt()) |
454 | panic("Fatal exception in interrupt"); | 454 | panic("Fatal exception in interrupt"); |
455 | 455 | ||
456 | if (panic_on_oops) { | 456 | if (panic_on_oops) |
457 | printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); | 457 | panic("Fatal exception: panic_on_oops"); |
458 | ssleep(5); | 458 | |
459 | panic("Fatal exception"); | ||
460 | } | ||
461 | oops_exit(); | 459 | oops_exit(); |
462 | do_exit(SIGSEGV); | 460 | do_exit(SIGSEGV); |
463 | } | 461 | } |