diff mbox

[1/2] MIPS: panic immediately when panic_on_oops

Message ID 1457554123-18491-2-git-send-email-aaro.koskinen@iki.fi (mailing list archive)
State Not Applicable
Headers show

Commit Message

Aaro Koskinen March 9, 2016, 8:08 p.m. UTC
MIPS wants to sleep 5 seconds before panicking when panic_on_oops is set,
with no apparent reason. Remove this feature, since some users may want
their systems to fail as quickly as possible.

Users who want to delay reboot after panic can use PANIC_TIMEOUT.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
 arch/mips/kernel/traps.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
diff mbox


diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index bf14da9..5756740 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -398,11 +398,8 @@  void __noreturn die(const char *str, struct pt_regs *regs)
 	if (in_interrupt())
 		panic("Fatal exception in interrupt");
-	if (panic_on_oops) {
-		printk(KERN_EMERG "Fatal exception: panic in 5 seconds");
-		ssleep(5);
+	if (panic_on_oops)
 		panic("Fatal exception");
-	}
 	if (regs && kexec_should_crash(current))