diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 07:48:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 07:48:37 -0700 |
| commit | e207e143e2fb6a2790b1ce3687c8aedc3ddc357b (patch) | |
| tree | 68e3f9cbfb31f735ac543f736aafc8b5dea0c117 /arch | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
| download | op-kernel-dev-e207e143e2fb6a2790b1ce3687c8aedc3ddc357b.zip op-kernel-dev-e207e143e2fb6a2790b1ce3687c8aedc3ddc357b.tar.gz | |
Revert "x86, mce: do not compile mcelog message on AMD"
This reverts commit 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9, as
requested by Andi Kleen:
"Obviously kernels compiled with AMD support can still run on non AMD
systems, so messages like this can never be removed at compile time."
Requsted-by: Andi Kleen <andi@firstfloor.org>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
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 4b2af86..183c345 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) static void print_mce_tail(void) { printk(KERN_EMERG "This is not a software problem!\n" -#if (!defined(CONFIG_EDAC) || !defined(CONFIG_CPU_SUP_AMD)) - "Run through mcelog --ascii to decode and contact your hardware vendor\n" -#endif - ); + "Run through mcelog --ascii to decode and contact your hardware vendor\n"); } #define PANIC_TIMEOUT 5 /* 5 seconds */ |
