Skip to content

Commit

Permalink
x86, mce: make non Monarch panic message "Fatal machine check" too
Browse files Browse the repository at this point in the history
... 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>
  • Loading branch information
Andi Kleen authored and H. Peter Anvin committed Jun 3, 2009
1 parent 3c07979 commit ac96037
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/kernel/cpu/mcheck/mce.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ac96037

Please sign in to comment.