diff options
author | Horms <horms@verge.net.au> | 2006-08-14 02:24:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-14 15:54:29 -0400 |
commit | 012c437d03cb299814e58ac8d574f7510f5989a5 (patch) | |
tree | 2e7eb5c22549c80b797dd4e99bc4c2c55e64f254 /arch/i386 | |
parent | 485311a23c72c87332f9a55ce25e650e40ae3fc7 (diff) |
[PATCH] Change panic_on_oops message to "Fatal exception"
Previously the message was "Fatal exception: panic_on_oops", as introduced
in a recent patch whith removed a somewhat dangerous call to ssleep() in
the panic_on_oops path. However, Paul Mackerras suggested that this was
somewhat confusing, leadind people to believe that it was panic_on_oops
that was the root cause of the fatal exception. On his suggestion, this
patch changes the message to simply "Fatal exception". A suitable oops
message should already have been displayed.
Signed-off-by: Simon Horman <horms@verge.net.au>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 0d4005dc06c5..82e0fd02af1c 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -454,7 +454,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
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 | panic("Fatal exception: panic_on_oops"); | 457 | panic("Fatal exception"); |
458 | 458 | ||
459 | oops_exit(); | 459 | oops_exit(); |
460 | do_exit(SIGSEGV); | 460 | do_exit(SIGSEGV); |