---

yaml --- r: 112710 b: refs/heads/master c: 9ce122c h: refs/heads/master v: v3
git-mirror · Aug 15, 2008 · 150370c · 150370c
1 parent acb0888
commit 150370c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 }