Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753870AbcCIUJH (ORCPT ); Wed, 9 Mar 2016 15:09:07 -0500 Received: from emh03.mail.saunalahti.fi ([62.142.5.109]:44274 "EHLO emh03.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932950AbcCIUI5 (ORCPT ); Wed, 9 Mar 2016 15:08:57 -0500 From: Aaro Koskinen To: Ralf Baechle , "James E.J. Bottomley" , Helge Deller , linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Aaro Koskinen Subject: [PATCH 1/2] MIPS: panic immediately when panic_on_oops Date: Wed, 9 Mar 2016 22:08:42 +0200 Message-Id: <1457554123-18491-2-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1457554123-18491-1-git-send-email-aaro.koskinen@iki.fi> References: <1457554123-18491-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 933 Lines: 30 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 --- arch/mips/kernel/traps.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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)) crash_kexec(regs); -- 2.4.0