x86: apic - unify lapic_shutdown

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / apic_32.c

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 13c4b79441da07e54cf9682940308bc69e5a6804..d4efe86adc72fea62c3c31938b265813525c4f8a 100644 (file)
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -838,10 +838,13 @@ void lapic_shutdown(void)
 
        local_irq_save(flags);
 
-       if (enabled_via_apicbase)
-               disable_local_APIC();
-       else
+#ifdef CONFIG_X86_32
+       if (!enabled_via_apicbase)
                clear_local_APIC();
+       else
+#endif
+               disable_local_APIC();
+
 
        local_irq_restore(flags);
 }