diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 18:52:58 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-24 18:52:58 -0500 |
commit | 15d4fcd615989ed83fe848e6a3c7e9f0361cf0d0 (patch) | |
tree | bd2c0a50367431c9d3c24fca7ab373607bb05142 /arch/x86/configs | |
parent | 1250fbed1471b681f3e75e4938f356a1c0a92d5e (diff) |
x86, mce: enable machine checks in 32-bit defconfig
Impact: defconfig change
Enable MCE in the 32-bit defconfig.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/configs')
-rw-r--r-- | arch/x86/configs/i386_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 8f40a80ccb55..c2cae417fab8 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_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:57 2009 | 4 | # Tue Feb 24 15:50:58 2009 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -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_NONFATAL=y | ||
273 | CONFIG_X86_MCE_P4THERMAL=y | ||
272 | CONFIG_VM86=y | 274 | CONFIG_VM86=y |
273 | # CONFIG_TOSHIBA is not set | 275 | # CONFIG_TOSHIBA is not set |
274 | # CONFIG_I8K is not set | 276 | # CONFIG_I8K is not set |