From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932564AbcKHQTL (ORCPT ); Tue, 8 Nov 2016 11:19:11 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51820 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932305AbcKHQTJ (ORCPT ); Tue, 8 Nov 2016 11:19:09 -0500 Date: Tue, 8 Nov 2016 08:18:55 -0800 From: tip-bot for Yinghai Lu Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, tony.luck@intel.com, hpa@zytor.com, linux-edac@vger.kernel.org, tglx@linutronix.de, x86@kernel.org, yinghai.lu@oracle.com, bp@suse.de Reply-To: bp@suse.de, x86@kernel.org, linux-edac@vger.kernel.org, tglx@linutronix.de, yinghai.lu@oracle.com, tony.luck@intel.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20160916202325.4972-1-yinghai@kernel.org> References: <20160916202325.4972-1-yinghai@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/MCE: Do not look at panic_on_oops in the severity grading Git-Commit-ID: f5e886ef9b45a3dbfd42b054a13c755894ea8402 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f5e886ef9b45a3dbfd42b054a13c755894ea8402 Gitweb: http://git.kernel.org/tip/f5e886ef9b45a3dbfd42b054a13c755894ea8402 Author: Yinghai Lu AuthorDate: Fri, 16 Sep 2016 13:23:25 -0700 Committer: Thomas Gleixner CommitDate: Tue, 8 Nov 2016 17:10:12 +0100 x86/MCE: Do not look at panic_on_oops in the severity grading The MCE tolerance levels control whether we panic on a machine check or do something else like generating a signal and logging error information. This is controlled by the mce= command line parameter. However, if panic_on_oops is set, it will force a panic for such an MCE even though the user didn't want to. So don't check panic_on_oops in the severity grading anymore. One of the use cases for that is recovery from uncorrectable errors with mce=2. [ Boris: rewrite commit message. ] Signed-off-by: Yinghai Lu Acked-by: Tony Luck Cc: linux-edac Cc: x86-ml Link: http://lkml.kernel.org/r/20160916202325.4972-1-yinghai@kernel.org Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c index 631356c..c7efbcf 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -311,7 +311,7 @@ static int mce_severity_intel(struct mce *m, int tolerant, char **msg, bool is_e *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;