x86: apic - unify end_local_APIC_setup

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index c3a252b1a8bee01cd4271ca3a2131e7846fca02a..f1882329b9cfa2507594e36eabc23696fe2e676b 100644 (file)
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1155,13 +1155,15 @@ void __cpuinit setup_local_APIC(void)
 
 void __cpuinit end_local_APIC_setup(void)
 {
-       unsigned long value;
-
        lapic_setup_esr();
+
+#ifdef CONFIG_X86_32
+       unsigned int value;
        /* Disable the local apic timer */
        value = apic_read(APIC_LVTT);
        value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
        apic_write(APIC_LVTT, value);
+#endif
 
        setup_apic_nmi_watchdog(NULL);
        apic_pm_activate();

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 76c20773bedf0814473a6c35b8165571cc130ea1..eec10b34dc49396b88700259a41422ac2393e46d 100644 (file)
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1014,6 +1014,15 @@ void __cpuinit setup_local_APIC(void)
 void __cpuinit end_local_APIC_setup(void)
 {
        lapic_setup_esr();
+
+#ifdef CONFIG_X86_32
+       unsigned int value;
+       /* Disable the local apic timer */
+       value = apic_read(APIC_LVTT);
+       value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
+       apic_write(APIC_LVTT, value);
+#endif
+
        setup_apic_nmi_watchdog(NULL);
        apic_pm_activate();
 }