aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorHorms <horms@verge.net.au>2006-08-14 02:24:22 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-14 15:54:29 -0400
commit012c437d03cb299814e58ac8d574f7510f5989a5 (patch)
tree2e7eb5c22549c80b797dd4e99bc4c2c55e64f254 /arch/powerpc
parent485311a23c72c87332f9a55ce25e650e40ae3fc7 (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/powerpc')
-rw-r--r--arch/powerpc/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 2105767fcc57..05682a24b210 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -151,7 +151,7 @@ int die(const char *str, struct pt_regs *regs, long err)
151 panic("Fatal exception in interrupt"); 151 panic("Fatal exception in interrupt");
152 152
153 if (panic_on_oops) 153 if (panic_on_oops)
154 panic("Fatal exception: panic_on_oops"); 154 panic("Fatal exception");
155 155
156 do_exit(err); 156 do_exit(err);
157 157