x86, mce: do not compile mcelog message on AMD
authorBorislav Petkov <borislav.petkov@amd.com>
Tue, 28 Jul 2009 12:47:10 +0000 (14:47 +0200)
committerBorislav Petkov <borislav.petkov@amd.com>
Mon, 14 Sep 2009 17:01:41 +0000 (19:01 +0200)
Now that decoding is done in-kernel, suppress mcelog message part.

CC: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
arch/x86/kernel/cpu/mcheck/mce.c

index b82866f6adf554a0a03bbd637944e44937a77a70..9bfe9d2ea61570e54f28cccae5f66b1ed5cf63bd 100644 (file)
@@ -222,7 +222,10 @@ static void print_mce_head(void)
 static void print_mce_tail(void)
 {
        printk(KERN_EMERG "This is not a software problem!\n"
-              "Run through mcelog --ascii to decode and contact your hardware vendor\n");
+#if (!defined(CONFIG_EDAC) || !defined(CONFIG_CPU_SUP_AMD))
+              "Run through mcelog --ascii to decode and contact your hardware vendor\n"
+#endif
+              );
 }
 
 #define PANIC_TIMEOUT 5 /* 5 seconds */