From: Horms 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 Cc: Paul Mackerras Signed-off-by: Andrew Morton --- arch/arm/kernel/traps.c | 2 +- arch/i386/kernel/traps.c | 2 +- arch/ia64/kernel/traps.c | 2 +- arch/powerpc/kernel/traps.c | 2 +- arch/x86_64/kernel/traps.c | 2 +- arch/xtensa/kernel/traps.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff -puN arch/arm/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception arch/arm/kernel/traps.c --- a/arch/arm/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception +++ a/arch/arm/kernel/traps.c @@ -233,7 +233,7 @@ NORET_TYPE void die(const char *str, str spin_unlock_irq(&die_lock); if (panic_on_oops) - panic("Fatal exception: panic_on_oops"); + panic("Fatal exception"); do_exit(SIGSEGV); } diff -puN arch/i386/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception arch/i386/kernel/traps.c --- a/arch/i386/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception +++ a/arch/i386/kernel/traps.c @@ -454,7 +454,7 @@ void die(const char * str, struct pt_reg panic("Fatal exception in interrupt"); if (panic_on_oops) - panic("Fatal exception: panic_on_oops"); + panic("Fatal exception"); oops_exit(); do_exit(SIGSEGV); diff -puN arch/ia64/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception arch/ia64/kernel/traps.c --- a/arch/ia64/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception +++ a/arch/ia64/kernel/traps.c @@ -118,7 +118,7 @@ die (const char *str, struct pt_regs *re spin_unlock_irq(&die.lock); if (panic_on_oops) - panic("Fatal exception: panic_on_oops"); + panic("Fatal exception"); do_exit(SIGSEGV); } diff -puN arch/powerpc/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception arch/powerpc/kernel/traps.c --- a/arch/powerpc/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception +++ a/arch/powerpc/kernel/traps.c @@ -151,7 +151,7 @@ int die(const char *str, struct pt_regs panic("Fatal exception in interrupt"); if (panic_on_oops) - panic("Fatal exception: panic_on_oops"); + panic("Fatal exception"); do_exit(err); diff -puN arch/x86_64/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception arch/x86_64/kernel/traps.c --- a/arch/x86_64/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception +++ a/arch/x86_64/kernel/traps.c @@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long fl /* 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) diff -puN arch/xtensa/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception arch/xtensa/kernel/traps.c --- a/arch/xtensa/kernel/traps.c~change-panic_on_oops-message-to-fatal-exception +++ a/arch/xtensa/kernel/traps.c @@ -488,7 +488,7 @@ void die(const char * str, struct pt_reg panic("Fatal exception in interrupt"); if (panic_on_oops) - panic("Fatal exception: panic_on_oops"); + panic("Fatal exception"); do_exit(err); } _