patch-2.4.11-dontuse linux/arch/sparc64/prom/misc.c

Next file: linux/drivers/block/genhd.c
Previous file: linux/arch/sparc64/mm/ultra.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.10/linux/arch/sparc64/prom/misc.c linux/arch/sparc64/prom/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.19 2000/06/30 10:18:38 davem Exp $
+/* $Id: misc.c,v 1.20 2001/09/21 03:17:07 kanoj Exp $
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
  *
@@ -59,25 +59,15 @@
 		prom_palette (1);
 #endif
 
-	/* We always arrive here via a serial interrupt.
-	 * So in order for everything to work reliably, even
-	 * on SMP, we need to drop the IRQ locks we hold.
-	 */
 #ifdef CONFIG_SMP
-	irq_exit(smp_processor_id(), 0);
 	smp_capture();
-#else
-	local_irq_count(smp_processor_id())--;
 #endif
 
 	p1275_cmd ("enter", P1275_INOUT(0,0));
 
 #ifdef CONFIG_SMP
 	smp_release();
-	irq_enter(smp_processor_id(), 0);
 	spin_unlock_wait(&__br_write_locks[BR_GLOBALIRQ_LOCK].lock);
-#else
-	local_irq_count(smp_processor_id())++;
 #endif
 
 #ifdef CONFIG_SUN_CONSOLE

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)