aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 76c20773bedf..eec10b34dc49 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1014,6 +1014,15 @@ void __cpuinit setup_local_APIC(void)
1014void __cpuinit end_local_APIC_setup(void) 1014void __cpuinit end_local_APIC_setup(void)
1015{ 1015{
1016 lapic_setup_esr(); 1016 lapic_setup_esr();
1017
1018#ifdef CONFIG_X86_32
1019 unsigned int value;
1020 /* Disable the local apic timer */
1021 value = apic_read(APIC_LVTT);
1022 value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
1023 apic_write(APIC_LVTT, value);
1024#endif
1025
1017 setup_apic_nmi_watchdog(NULL); 1026 setup_apic_nmi_watchdog(NULL);
1018 apic_pm_activate(); 1027 apic_pm_activate();
1019} 1028}