patch-2.3.99-pre6 linux/arch/sparc64/prom/misc.c

• Lines: 26
• Date: Mon Apr 24 13:59:58 2000
• Orig file: v2.3.99-pre5/linux/arch/sparc64/prom/misc.c
• Orig date: Wed Dec 29 13:13:15 1999

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/sparc64/prom/misc.c linux/arch/sparc64/prom/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.16 1999/11/19 05:53:04 davem Exp $
+/* $Id: misc.c,v 1.17 2000/04/15 06:02:50 davem Exp $
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
  *
@@ -64,7 +64,7 @@
 	 * on SMP, we need to drop the IRQ locks we hold.
 	 */
 #ifdef __SMP__
-	hardirq_exit(smp_processor_id());
+	irq_exit(smp_processor_id(), 0);
 	smp_capture();
 #else
 	local_irq_count--;
@@ -74,8 +74,8 @@
 
 #ifdef __SMP__
 	smp_release();
-	hardirq_enter(smp_processor_id());
-	spin_unlock_wait(&global_irq_lock);
+	irq_enter(smp_processor_id(), 0);
+	spin_unlock_wait(&__br_write_locks[BR_GLOBALIRQ_LOCK].lock);
 #else
 	local_irq_count++;
 #endif