openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Andi Kleen 2009-05-27 21:56:58 +02:00 committed by H. Peter Anvin
parent 3c0797925f
commit ac9603754d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/cpu/mcheck/mce.c
View File

@ -554,7 +554,7 @@ static void mce_reign(void)
* other CPUs. * other CPUs.
*/ */
if (m && global_worst >= MCE_PANIC_SEVERITY && tolerant < 3) 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. * 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. * support MCE broadcasting or it has been disabled.
*/ */
if (no_way_out && tolerant < 3) 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 * If the error seems to be unrecoverable, something should be