From patchwork Wed Mar 9 20:08:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 8549551 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 54ADF9F372 for ; Wed, 9 Mar 2016 20:18:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78792202C8 for ; Wed, 9 Mar 2016 20:18:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8586020295 for ; Wed, 9 Mar 2016 20:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934060AbcCIUR4 (ORCPT ); Wed, 9 Mar 2016 15:17:56 -0500 Received: from emh03.mail.saunalahti.fi ([62.142.5.109]:44706 "EHLO emh03.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753803AbcCIUR4 (ORCPT ); Wed, 9 Mar 2016 15:17:56 -0500 Received: from localhost.localdomain (85-76-14-12-nat.elisa-mobile.fi [85.76.14.12]) by emh03.mail.saunalahti.fi (Postfix) with ESMTP id D08DF1887B3; Wed, 9 Mar 2016 22:08:55 +0200 (EET) 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 2/2] PA-RISC: panic immediately when panic_on_oops Date: Wed, 9 Mar 2016 22:08:43 +0200 Message-Id: <1457554123-18491-3-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-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PA-RISC 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 Acked-by: Helge Deller --- arch/parisc/kernel/traps.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 553b098..16e0735 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -284,11 +284,8 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) if (in_interrupt()) panic("Fatal exception in interrupt"); - if (panic_on_oops) { - printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); - ssleep(5); + if (panic_on_oops) panic("Fatal exception"); - } oops_exit(); do_exit(SIGSEGV);