[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-f5e886ef9b45a3dbfd42b054a13c755894ea8402@git.kernel.org>
Date: Tue, 8 Nov 2016 08:18:55 -0800
From: tip-bot for Yinghai Lu <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, mingo@...nel.org,
tony.luck@...el.com, hpa@...or.com, linux-edac@...r.kernel.org,
tglx@...utronix.de, x86@...nel.org, yinghai.lu@...cle.com,
bp@...e.de
Subject: [tip:ras/core] x86/MCE: Do not look at panic_on_oops in the
severity grading
Commit-ID: f5e886ef9b45a3dbfd42b054a13c755894ea8402
Gitweb: http://git.kernel.org/tip/f5e886ef9b45a3dbfd42b054a13c755894ea8402
Author: Yinghai Lu <yinghai.lu@...cle.com>
AuthorDate: Fri, 16 Sep 2016 13:23:25 -0700
Committer: Thomas Gleixner <tglx@...utronix.de>
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=<level> 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 <yinghai.lu@...cle.com>
Acked-by: Tony Luck <tony.luck@...el.com>
Cc: linux-edac <linux-edac@...r.kernel.org>
Cc: x86-ml <x86@...nel.org>
Link: http://lkml.kernel.org/r/20160916202325.4972-1-yinghai@kernel.org
Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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;
Powered by blists - more mailing lists