Commit e207e143 authored Sep 30, 2009 by Linus Torvalds

Revert "x86, mce: do not compile mcelog message on AMD"



This reverts commit 22223c9b, 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>

parent 17d857be

arch/x86/kernel/cpu/mcheck/mce.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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 */