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>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index ba431893e31d..d5cb0b4c17ff 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -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