diff options
| author | Andi Kleen <andi@firstfloor.org> | 2009-02-12 13:43:20 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 00:52:21 +0100 |
| commit | 1250fbed1471b681f3e75e4938f356a1c0a92d5e (patch) | |
| tree | cbcbd0c818e078c85704baffac9e25b9ff1e5d59 /arch/x86/configs | |
| parent | x86, defconfig: turn off CONFIG_SCSI_ISCSI_ATTRS=y (diff) | |
| download | linux-1250fbed1471b681f3e75e4938f356a1c0a92d5e.tar.xz linux-1250fbed1471b681f3e75e4938f356a1c0a92d5e.zip | |
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_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 @@ # # 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 |