summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorHorms <horms@verge.net.au>2006-08-13 23:24:22 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-14 12:54:29 -0700
commit012c437d03cb299814e58ac8d574f7510f5989a5 (patch)
tree2e7eb5c22549c80b797dd4e99bc4c2c55e64f254 /arch/x86_64
parent485311a23c72c87332f9a55ce25e650e40ae3fc7 (diff)
downloadop-kernel-dev-012c437d03cb299814e58ac8d574f7510f5989a5.zip
op-kernel-dev-012c437d03cb299814e58ac8d574f7510f5989a5.tar.gz
[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/x86_64')
-rw-r--r--arch/x86_64/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 4e9938d..14052f0 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long flags)
/* Nest count reaches zero, release the lock. */
spin_unlock_irqrestore(&die_lock, flags);
if (panic_on_oops)
- panic("Fatal exception: panic_on_oops");
+ panic("Fatal exception");
}
void __kprobes __die(const char * str, struct pt_regs * regs, long err)
OpenPOWER on IntegriCloud