---

yaml --- r: 138633 b: refs/heads/master c: e35849e h: refs/heads/master i: 138631: 9f5074c v: v3
git-mirror · Feb 19, 2009 · defcf40 · defcf40
1 parent b2bff68
commit defcf40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef41df4344ff952c79746d44a6126bd2cf7ed2bc
+refs/heads/master: e35849e910a6543d37c0d13648ef166678d03565
diff --git a/trunk/arch/x86/configs/x86_64_defconfig b/trunk/arch/x86/configs/x86_64_defconfig
@@ -247,7 +247,10 @@ CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
-# CONFIG_X86_MCE is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_NEW_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
 # CONFIG_I8K is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_OLD_INTERFACE=y