From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762098AbcIPUXs (ORCPT ); Fri, 16 Sep 2016 16:23:48 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:35542 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755093AbcIPUXq (ORCPT ); Fri, 16 Sep 2016 16:23:46 -0400 From: Yinghai Lu To: Tony Luck , Borislav Petkov Cc: the arch/x86 maintainers , Linux Kernel Mailing List , linux-edac@vger.kernel.org, Yinghai Lu Subject: [RFC PATCH] x86: Do not panic if mce=2 is passed Date: Fri, 16 Sep 2016 13:23:25 -0700 Message-Id: <20160916202325.4972-1-yinghai@kernel.org> X-Mailer: git-send-email 2.8.3 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yinghai Lu For UE recovery support, current we need mce=2 in command line and also disable panic_on_oops with sysctl. but other user may still need to have panic_on_oops to 1 always. We can remove checking of panic_on_oops for mce-severity path. We should be ok as on default path when mce=2 is not passed, tolerant is 0, so they will still get MCE_PANIC_SEVERITY returned. Signed-off-by: Yinghai Lu --- arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6/arch/x86/kernel/cpu/mcheck/mce-severity.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ linux-2.6/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -311,7 +311,7 @@ static int mce_severity_intel(struct mce *msg = s->msg; s->covered = 1; if (s->sev >= MCE_UC_SEVERITY && ctx == IN_KERNEL) { - if (panic_on_oops || tolerant < 1) + if (tolerant < 1) return MCE_PANIC_SEVERITY; } return s->sev;