Commit 99a7a234 authored Mar 09, 2016 by Aaro Koskinen Committed by Ralf Baechle May 13, 2016

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 <aaro.koskinen@iki.fi>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-mips@linux-mips.org
Cc: linux-parisc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12845/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 2ab71a02

arch/mips/kernel/traps.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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);

Admin message