aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/configs
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2009-02-12 12:43:20 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2009-02-24 23:52:21 (GMT)
commit1250fbed1471b681f3e75e4938f356a1c0a92d5e (patch)
treecbcbd0c818e078c85704baffac9e25b9ff1e5d59 /arch/x86/configs
parentbd282422fe9566a89bc34af325efb6d2701903be (diff)
x86, mce: enable machine checks in 64-bit defconfig
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>
Diffstat (limited to 'arch/x86/configs')
-rw-r--r--arch/x86/configs/x86_64_defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 10728fd..9fd7d15 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -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

Privacy Policy