From e507a5faf3a46f570c7ab0e1bbedfaa63271ee30 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Thu, 12 Feb 2009 13:49:38 +0100
Subject: [PATCH] --- yaml --- r: 138649 b: refs/heads/master c:
 be71b8553d0522aba535a815baaebb1f0bb9a9ec h: refs/heads/master i:   138647:
 9fecad701fcdba41441daac3b13ae48af2847cb1 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/apic.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 046741e658b9..2358559bf93a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca8681ca10f671427710f4954644359856581a3
+refs/heads/master: be71b8553d0522aba535a815baaebb1f0bb9a9ec
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index 648676f0b50a..57b53774d986 100644
--- a/trunk/arch/x86/kernel/apic.c
+++ b/trunk/arch/x86/kernel/apic.c
@@ -48,6 +48,7 @@
 #include <asm/apic.h>
 #include <asm/i8259.h>
 #include <asm/smp.h>
+#include <asm/mce.h>
 
 #include <mach_apic.h>
 #include <mach_apicdef.h>
@@ -1270,6 +1271,12 @@ void __cpuinit setup_local_APIC(void)
 	apic_write(APIC_LVT1, value);
 
 	preempt_enable();
+
+#ifdef CONFIG_X86_MCE_INTEL
+	/* Recheck CMCI information after local APIC is up on CPU #0 */
+	if (smp_processor_id() == 0)
+		cmci_recheck();
+#endif
 }
 
 void __cpuinit end_local_APIC_setup(void)