From defcf4064b752ec7b3074a05de44d00a063e1cb0 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Thu, 12 Feb 2009 13:43:20 +0100
Subject: [PATCH] --- yaml --- r: 138633 b: refs/heads/master c:
 e35849e910a6543d37c0d13648ef166678d03565 h: refs/heads/master i:   138631:
 9f5074ca7ade256fabc65d7eb12154fb7f2d3958 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/configs/x86_64_defconfig | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eac341a64962..87a140400684 100644
--- 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
index 322dd2748fc9..786ce5ac2acc 100644
--- 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