diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index d0667020a2c6..65617bad79a5 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.56 1996/05/18 12:35:18 mrg Exp $ */
+/*	$NetBSD: autoconf.c,v 1.57 1996/05/19 04:12:53 mrg Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -1710,6 +1710,8 @@ romgetcursoraddr(rowp, colp)
 void
 romhalt()
 {
+	if (CPU_ISSUN4COR4M)
+		*promvec->pv_synchook = NULL;
 
 	promvec->pv_halt();
 	panic("PROM exit failed");
@@ -1719,6 +1721,8 @@ void
 romboot(str)
 	char *str;
 {
+	if (CPU_ISSUN4COR4M)
+		*promvec->pv_synchook = NULL;
 
 	promvec->pv_reboot(str);
 	panic("PROM boot failed");
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index b4721a1e2346..03dc4fc1a3b0 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.63 1996/05/18 12:36:49 mrg Exp $ */
+/*	$NetBSD: machdep.c,v 1.64 1996/05/19 04:12:56 mrg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -625,8 +625,6 @@ boot(howto)
 
 	if (cold) {
 		printf("halted\n\n");
-		if (CPU_ISSUN4COR4M)
-			*promvec->pv_synchook = NULL;
 		romhalt();
 	}
 
@@ -653,8 +651,6 @@ boot(howto)
 	if (howto & RB_HALT) {
 		doshutdownhooks();
 		printf("halted\n\n");
-		if (CPU_ISSUN4COR4M)
-			*promvec->pv_synchook = NULL;
 		romhalt();
 	}
 	if (howto & RB_DUMP)
@@ -672,8 +668,6 @@ boot(howto)
 		str[i] = 0;
 	} else
 		str[0] = 0;
-	if (CPU_ISSUN4COR4M)
-		*promvec->pv_synchook = NULL;
 	romboot(str);
 	/*NOTREACHED*/
 }