---

yaml --- r: 21036 b: refs/heads/master c: 6796313 h: refs/heads/master v: v3
git-mirror · Mar 14, 2006 · 4b39124 · 4b39124
1 parent 776c3d0
commit 4b39124
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbf0ec6ee001ab89471397ac84105b2e3b2fd986
+refs/heads/master: 67963132638e67ad3c5aa16765e6f3f2f3cdd85c
diff --git a/trunk/arch/i386/kernel/apic.c b/trunk/arch/i386/kernel/apic.c
@@ -570,16 +570,18 @@ void __devinit setup_local_APIC(void)
  */
 void lapic_shutdown(void)
 {
+	unsigned long flags;
+
 	if (!cpu_has_apic)
 		return;
 
-	local_irq_disable();
+	local_irq_save(flags);
 	clear_local_APIC();
 
 	if (enabled_via_apicbase)
 		disable_local_APIC();
 
-	local_irq_enable();
+	local_irq_restore(flags);
 }
 
 #ifdef CONFIG_PM