aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 4b2af86e3e8d..183c3457d2f4 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -204,10 +204,7 @@ static void print_mce_head(void)
204static void print_mce_tail(void) 204static void print_mce_tail(void)
205{ 205{
206 printk(KERN_EMERG "This is not a software problem!\n" 206 printk(KERN_EMERG "This is not a software problem!\n"
207#if (!defined(CONFIG_EDAC) || !defined(CONFIG_CPU_SUP_AMD)) 207 "Run through mcelog --ascii to decode and contact your hardware vendor\n");
208 "Run through mcelog --ascii to decode and contact your hardware vendor\n"
209#endif
210 );
211} 208}
212 209
213#define PANIC_TIMEOUT 5 /* 5 seconds */ 210#define PANIC_TIMEOUT 5 /* 5 seconds */