---

yaml --- r: 138649 b: refs/heads/master c: be71b85 h: refs/heads/master i: 138647: 9fecad7 v: v3
git-mirror · Feb 24, 2009 · e507a5f · e507a5f
1 parent 8d2e262
commit e507a5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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)