diff options
author | Andi Kleen <andi@firstfloor.org> | 2009-02-12 07:43:20 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 18:52:21 -0500 |
commit | 1250fbed1471b681f3e75e4938f356a1c0a92d5e (patch) | |
tree | cbcbd0c818e078c85704baffac9e25b9ff1e5d59 /arch/x86/configs/x86_64_defconfig | |
parent | bd282422fe9566a89bc34af325efb6d2701903be (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/x86_64_defconfig')
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 10728fd91c63..9fd7d156a129 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.29-rc4 | 3 | # Linux kernel version: 2.6.29-rc4 |
4 | # Thu Feb 12 12:57:29 2009 | 4 | # Tue Feb 24 15:44:16 2009 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | # CONFIG_X86_32 is not set | 7 | # CONFIG_X86_32 is not set |
@@ -268,7 +268,9 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
268 | CONFIG_X86_LOCAL_APIC=y | 268 | CONFIG_X86_LOCAL_APIC=y |
269 | CONFIG_X86_IO_APIC=y | 269 | CONFIG_X86_IO_APIC=y |
270 | CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y | 270 | CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y |
271 | # CONFIG_X86_MCE is not set | 271 | CONFIG_X86_MCE=y |
272 | CONFIG_X86_MCE_INTEL=y | ||
273 | CONFIG_X86_MCE_AMD=y | ||
272 | # CONFIG_I8K is not set | 274 | # CONFIG_I8K is not set |
273 | CONFIG_MICROCODE=y | 275 | CONFIG_MICROCODE=y |
274 | CONFIG_MICROCODE_INTEL=y | 276 | CONFIG_MICROCODE_INTEL=y |