diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2009-07-28 08:47:10 -0400 |
|---|---|---|
| committer | Borislav Petkov <borislav.petkov@amd.com> | 2009-09-14 13:01:41 -0400 |
| commit | 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9 (patch) | |
| tree | 6dae366795fbb3e28d2496c62db2ffd981516afc | |
| parent | 53bd5fedca7d0c28b35b02cab5f4e27bf8d7fabe (diff) | |
x86, mce: do not compile mcelog message on AMD
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>
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index b82866f6adf5..9bfe9d2ea615 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
| @@ -222,7 +222,10 @@ static void print_mce_head(void) | |||
| 222 | static void print_mce_tail(void) | 222 | static void print_mce_tail(void) |
| 223 | { | 223 | { |
| 224 | printk(KERN_EMERG "This is not a software problem!\n" | 224 | printk(KERN_EMERG "This is not a software problem!\n" |
| 225 | "Run through mcelog --ascii to decode and contact your hardware vendor\n"); | 225 | #if (!defined(CONFIG_EDAC) || !defined(CONFIG_CPU_SUP_AMD)) |
| 226 | "Run through mcelog --ascii to decode and contact your hardware vendor\n" | ||
| 227 | #endif | ||
| 228 | ); | ||
| 226 | } | 229 | } |
| 227 | 230 | ||
| 228 | #define PANIC_TIMEOUT 5 /* 5 seconds */ | 231 | #define PANIC_TIMEOUT 5 /* 5 seconds */ |
