summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 21:49:25 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-05 21:49:25 +0100
commitcaab36b593b44c97e3c7707c6a8054b320f8d622 (patch)
tree70c8d67d51c616c357529d761a82ad382481dad7 /arch/x86/kernel/apic
parenta1413c89ae6a4b7a9a43f7768934a81ffb5c629a (diff)
parent73af76dfd1f998dba71d8e8e785cbe77a990bf17 (diff)
downloadop-kernel-dev-caab36b593b44c97e3c7707c6a8054b320f8d622.zip
op-kernel-dev-caab36b593b44c97e3c7707c6a8054b320f8d622.tar.gz
Merge branch 'x86/mce2' into x86/core
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r--arch/x86/kernel/apic/apic.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index f9cecdf..30909a2 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -46,6 +46,7 @@
#include <asm/idle.h>
#include <asm/mtrr.h>
#include <asm/smp.h>
+#include <asm/mce.h>
unsigned int num_processors;
@@ -842,6 +843,14 @@ void clear_local_APIC(void)
apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);
}
#endif
+#ifdef CONFIG_X86_MCE_INTEL
+ if (maxlvt >= 6) {
+ v = apic_read(APIC_LVTCMCI);
+ if (!(v & APIC_LVT_MASKED))
+ apic_write(APIC_LVTCMCI, v | APIC_LVT_MASKED);
+ }
+#endif
+
/*
* Clean APIC state for other OSs:
*/
@@ -1241,6 +1250,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)
OpenPOWER on IntegriCloud