1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 6af20dd12c96..a151d66f948c 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -830,10 +830,11 @@ void lapic_shutdown(void)
                 return;
 
         local_irq_save(flags);
-        clear_local_APIC();
 
         if (enabled_via_apicbase)
                 disable_local_APIC();
+        else
+                clear_local_APIC();
 
         local_irq_restore(flags);
 }