diff --git a/sys/sun4v/sun4v/machdep.c b/sys/sun4v/sun4v/machdep.c
index e38283dc4812..b76eb864655f 100644
--- a/sys/sun4v/sun4v/machdep.c
+++ b/sys/sun4v/sun4v/machdep.c
@@ -717,7 +717,7 @@ cpu_shutdown(void *args)
 #ifdef SMP
 	cpu_mp_shutdown();
 #endif
-	OF_exit();
+	hv_mach_exit(0);
 }
 
 /* Get current clock frequency for the given cpu id. */
diff --git a/sys/sun4v/sun4v/mp_machdep.c b/sys/sun4v/sun4v/mp_machdep.c
index 4ad7108ad8eb..c6d87a13d920 100644
--- a/sys/sun4v/sun4v/mp_machdep.c
+++ b/sys/sun4v/sun4v/mp_machdep.c
@@ -448,7 +448,6 @@ cpu_ipi_stop(struct trapframe *tf)
 	while ((started_cpus & PCPU_GET(cpumask)) == 0) {
 		if ((shutdown_cpus & PCPU_GET(cpumask)) != 0) {
 			atomic_clear_int(&shutdown_cpus, PCPU_GET(cpumask));
-			OF_exit();
 		}
 	}
 	atomic_clear_rel_int(&started_cpus, PCPU_GET(cpumask));
diff --git a/sys/sun4v/sun4v/vm_machdep.c b/sys/sun4v/sun4v/vm_machdep.c
index 46c0996fad90..99b122aa382e 100644
--- a/sys/sun4v/sun4v/vm_machdep.c
+++ b/sys/sun4v/sun4v/vm_machdep.c
@@ -321,10 +321,7 @@ cpu_reset(void)
 			bspec[0] = '\0';
 		bspec[sizeof(bspec) - 1] = '\0';
 	}
-#ifdef notyet
-	/* XXX SUN4V_FIXME */
-	openfirmware_exit(&args);
-#endif
+	hv_mach_sir();
 }
 
 /*