diff options
Diffstat (limited to 'arch/x86/kernel/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 648676f0b50a..57b53774d986 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <asm/apic.h> | 48 | #include <asm/apic.h> |
| 49 | #include <asm/i8259.h> | 49 | #include <asm/i8259.h> |
| 50 | #include <asm/smp.h> | 50 | #include <asm/smp.h> |
| 51 | #include <asm/mce.h> | ||
| 51 | 52 | ||
| 52 | #include <mach_apic.h> | 53 | #include <mach_apic.h> |
| 53 | #include <mach_apicdef.h> | 54 | #include <mach_apicdef.h> |
| @@ -1270,6 +1271,12 @@ void __cpuinit setup_local_APIC(void) | |||
| 1270 | apic_write(APIC_LVT1, value); | 1271 | apic_write(APIC_LVT1, value); |
| 1271 | 1272 | ||
| 1272 | preempt_enable(); | 1273 | preempt_enable(); |
| 1274 | |||
| 1275 | #ifdef CONFIG_X86_MCE_INTEL | ||
| 1276 | /* Recheck CMCI information after local APIC is up on CPU #0 */ | ||
| 1277 | if (smp_processor_id() == 0) | ||
| 1278 | cmci_recheck(); | ||
| 1279 | #endif | ||
| 1273 | } | 1280 | } |
| 1274 | 1281 | ||
| 1275 | void __cpuinit end_local_APIC_setup(void) | 1282 | void __cpuinit end_local_APIC_setup(void) |
