Skip to content

Commit f5e886e

Browse files
Yinghai LuKAGA-KOKO
authored andcommitted
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 <[email protected]> Acked-by: Tony Luck <[email protected]> Cc: linux-edac <[email protected]> Cc: x86-ml <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Borislav Petkov <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
1 parent bc33b0c commit f5e886e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/cpu/mcheck/mce-severity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static int mce_severity_intel(struct mce *m, int tolerant, char **msg, bool is_e
311311
*msg = s->msg;
312312
s->covered = 1;
313313
if (s->sev >= MCE_UC_SEVERITY && ctx == IN_KERNEL) {
314-
if (panic_on_oops || tolerant < 1)
314+
if (tolerant < 1)
315315
return MCE_PANIC_SEVERITY;
316316
}
317317
return s->sev;

0 commit comments

Comments
 (0)