aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/traps.c
diff options
context:
space:
mode:
authorHorms <horms@verge.net.au>2006-07-30 06:03:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-31 16:28:39 -0400
commitcea6a4ba8acfba6f59cc9ed71e0d05cb770b9d9c (patch)
tree8a8ad7de11c2261c3f850d97d91524ee64cc36c4 /arch/i386/kernel/traps.c
parentb8bdb460b7ecf08a4fed6e8b5b6b3fe874587aaa (diff)
[PATCH] panic_on_oops: remove ssleep()
This patch is part of an effort to unify the panic_on_oops behaviour across all architectures that implement it. It was pointed out to me by Andi Kleen that if an oops has occured in interrupt context, then calling sleep() in the oops path will only cause a panic, and that it would be really better for it not to be in the path at all. This patch removes the ssleep() call and reworks the console message accordinly. I have a slght concern that the resulting console message is too long, feedback welcome. For powerpc it also unifies the 32bit and 64bit behaviour. Fror x86_64, this patch only updates the console message, as ssleep() is already not present. Signed-off-by: Horms <horms@verge.net.au> Acked-by: Paul Mackerras <paulus@samba.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Andi Kleen <ak@muc.de> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r--arch/i386/kernel/traps.c8
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}