From: deraadt <deraadt@openbsd.org>
Date: Tue, 14 Nov 1995 13:24:58 +0000 (+0000)
Subject: clear pv_synchook if we halt; thus prom "sync" command will not do the wrong thing
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ab3a7bbba4cae126a77b598ef0d89285aeb69f35;p=openbsd

clear pv_synchook if we halt; thus prom "sync" command will not do the wrong thing
---

diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 9a479540101..beb7244f608 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -75,6 +75,7 @@
 #include <sys/exec.h>
 #include <sys/sysctl.h>
 
+#include <machine/bsd_openprom.h>
 #include <machine/autoconf.h>
 #include <machine/frame.h>
 #include <machine/cpu.h>
@@ -606,6 +607,7 @@ boot(howto)
 	static char str[4];	/* room for "-sd\0" */
 	extern volatile void romhalt(void);
 	extern volatile void romboot(char *);
+	extern	struct promvec *promvec;
 
 	fb_unblank();
 	boothowto = howto;
@@ -627,8 +629,13 @@ boot(howto)
 		resettodr();
 	}
 	(void) splhigh();		/* ??? */
+
 	if (howto & RB_HALT) {
 		printf("halted\n\n");
+#if defined(SUN4M) || defined(SUN4C)
+		if (cputyp==CPU_SUN4M || cputyp==CPU_SUN4C)
+			*promvec->pv_synchook = NULL;
+#endif
 		romhalt();
 	}
 	if (howto & RB_DUMP)
@@ -644,6 +651,10 @@ boot(howto)
 		str[i] = 0;
 	} else
 		str[0] = 0;
+#if defined(SUN4M) || defined(SUN4C)
+	if (cputyp==CPU_SUN4M || cputyp==CPU_SUN4C)
+		*promvec->pv_synchook = NULL;
+#endif
 	romboot(str);
 	/*NOTREACHED*/
 }