Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac960375 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, mce: make non Monarch panic message "Fatal machine check" too 



... instead of "Machine check". This is for consistency with the Monarch
panic message.

Based on a report from Ying Huang.

v2: But add a descriptive postfix so that the test suite can distingush.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 3c079792

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

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static void mce_reign(void) 
	 * other CPUs.

	 */

	if (m && global_worst >= MCE_PANIC_SEVERITY && tolerant < 3)

		mce_panic("Fatal machine check", m, msg);

		mce_panic("Fatal Machine check", m, msg);



	/*

	 * For UC somewhere we let the CPU who detects it handle it.
@@ -858,7 +858,7 @@ void do_machine_check(struct pt_regs *regs, long error_code) 
	 * support MCE broadcasting or it has been disabled.

	 */

	if (no_way_out && tolerant < 3)

		mce_panic("Machine check", final, msg);

		mce_panic("Fatal machine check on current CPU", final, msg);



	/*

	 * If the error seems to be unrecoverable, something should be