Change panic_on_oops message to "Fatal exception"

PATCH New Horms 1 participant 1 message Aug 8, 2006

Subsystems (3)

Arm (32-bit) PowerPC Tensilica Xtensa port (xtensa)

lore

Share & tools

lore

Horms

author

2006-08-08 03:46 UTC #0 lore raw

PATCH 1/1 Change panic_on_oops message to "Fatal exception"

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 <[email protected]>

---
 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(-)

arch/arm/kernel/traps.c +1 -1

index 4e29dd0..aeeed80 100644
@@ -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);
 }

arch/i386/kernel/traps.c +1 -1

index 0d4005d..82e0fd0 100644
@@ -454,7 +454,7 @@ #endif
 		panic("Fatal exception in interrupt");
 
 	if (panic_on_oops)
-		panic("Fatal exception: panic_on_oops");
+		panic("Fatal exception");
 
 	oops_exit();
 	do_exit(SIGSEGV);

arch/ia64/kernel/traps.c +1 -1

index 5a04204..fffa9e0 100644
@@ -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);
 }

arch/powerpc/kernel/traps.c +1 -1

index 2105767..05682a2 100644
@@ -151,7 +151,7 @@ #endif
 		panic("Fatal exception in interrupt");
 
 	if (panic_on_oops)
-		panic("Fatal exception: panic_on_oops");
+		panic("Fatal exception");
 
 	do_exit(err);

arch/x86_64/kernel/traps.c +1 -1

index 4e9938d..14052f0 100644
@@ -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)

arch/xtensa/kernel/traps.c +1 -1

index 9734960..ce077d6 100644
@@ -488,7 +488,7 @@ #endif
 		panic("Fatal exception in interrupt");
 
 	if (panic_on_oops)
-		panic("Fatal exception: panic_on_oops");
+		panic("Fatal exception");
 
 	do_exit(err);
 }

Signature · 1 line

1.4.1.gd3ba6