patch-2.1.34 linux/arch/sparc/prom/misc.c

Next file: linux/arch/sparc64/Makefile
Previous file: linux/arch/sparc/mm/sun4c.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.33/linux/arch/sparc/prom/misc.c linux/arch/sparc/prom/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.12 1996/12/18 06:46:55 tridge Exp $
+/* $Id: misc.c,v 1.13 1997/04/10 05:12:59 davem Exp $
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
  *
@@ -92,6 +92,7 @@
 prom_halt(void)
 {
 	unsigned long flags;
+again:
 	save_flags(flags); cli();
 	(*(romvec->pv_halt))();
 	/* Never get here. */
@@ -99,6 +100,7 @@
 			     "r" (&current_set[smp_processor_id()]) :
 			     "memory");
 	restore_flags(flags);
+	goto again; /* PROM is out to get me -DaveM */
 }
 
 typedef void (*sfunc_t)(void);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov