Commit 012c437d authored by Horms's avatar Horms Committed by Greg Kroah-Hartman

[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: default avatarSimon Horman <horms@verge.net.au>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 485311a2
...@@ -233,7 +233,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) ...@@ -233,7 +233,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
spin_unlock_irq(&die_lock); spin_unlock_irq(&die_lock);
if (panic_on_oops) if (panic_on_oops)
panic("Fatal exception: panic_on_oops"); panic("Fatal exception");
do_exit(SIGSEGV); do_exit(SIGSEGV);
} }
......
...@@ -454,7 +454,7 @@ void die(const char * str, struct pt_regs * regs, long err) ...@@ -454,7 +454,7 @@ void die(const char * str, struct pt_regs * regs, long err)
panic("Fatal exception in interrupt"); panic("Fatal exception in interrupt");
if (panic_on_oops) if (panic_on_oops)
panic("Fatal exception: panic_on_oops"); panic("Fatal exception");
oops_exit(); oops_exit();
do_exit(SIGSEGV); do_exit(SIGSEGV);
......
...@@ -118,7 +118,7 @@ die (const char *str, struct pt_regs *regs, long err) ...@@ -118,7 +118,7 @@ die (const char *str, struct pt_regs *regs, long err)
spin_unlock_irq(&die.lock); spin_unlock_irq(&die.lock);
if (panic_on_oops) if (panic_on_oops)
panic("Fatal exception: panic_on_oops"); panic("Fatal exception");
do_exit(SIGSEGV); do_exit(SIGSEGV);
} }
......
...@@ -151,7 +151,7 @@ int die(const char *str, struct pt_regs *regs, long err) ...@@ -151,7 +151,7 @@ int die(const char *str, struct pt_regs *regs, long err)
panic("Fatal exception in interrupt"); panic("Fatal exception in interrupt");
if (panic_on_oops) if (panic_on_oops)
panic("Fatal exception: panic_on_oops"); panic("Fatal exception");
do_exit(err); do_exit(err);
......
...@@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long flags) ...@@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long flags)
/* Nest count reaches zero, release the lock. */ /* Nest count reaches zero, release the lock. */
spin_unlock_irqrestore(&die_lock, flags); spin_unlock_irqrestore(&die_lock, flags);
if (panic_on_oops) 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) void __kprobes __die(const char * str, struct pt_regs * regs, long err)
......
...@@ -488,7 +488,7 @@ void die(const char * str, struct pt_regs * regs, long err) ...@@ -488,7 +488,7 @@ void die(const char * str, struct pt_regs * regs, long err)
panic("Fatal exception in interrupt"); panic("Fatal exception in interrupt");
if (panic_on_oops) if (panic_on_oops)
panic("Fatal exception: panic_on_oops"); panic("Fatal exception");
do_exit(err); do_exit(err);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment