]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
x86, mce: enable machine checks in 64-bit defconfig
authorAndi Kleen <andi@firstfloor.org>
Thu, 12 Feb 2009 12:43:20 +0000 (13:43 +0100)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 24 Feb 2009 23:52:21 +0000 (15:52 -0800)
Impact: defconfig change

Enable MCE in the 64-bit defconfig.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/configs/x86_64_defconfig

index 10728fd91c630e1189bd5a9b0cefe01e86790df7..9fd7d156a129729b3d9b7d4daf44d3725cb42ecf 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-rc4
-# Thu Feb 12 12:57:29 2009
+# Tue Feb 24 15:44:16 2009
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -268,7 +268,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-# CONFIG_X86_MCE is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
 # CONFIG_I8K is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y