diff --git a/[refs] b/[refs]
index 3ad410208ae8..9767810a2b3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07f4f9046121ac803bc2f0ded3d77b7c2ab481b
+refs/heads/master: 9ce122c6e55c44ae9a4c4c777579b87d83e7f898
diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c
index 6af20dd12c96..a151d66f948c 100644
--- a/trunk/arch/x86/kernel/apic_32.c
+++ b/trunk/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);
 }