MIPS: panic immediately when panic_on_oops

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 <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/12845/
Signed-off-by: Ralf Baechle <[email protected]>

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 3cbd98729ab16c24ab263b576a88a69dc19d31e3..82c2fcf7e585f8897ee52d611a0e543f2cd85cc8 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -399,11 +399,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))
                crash_kexec(regs);