diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index f749f035cc4c..c21ea8c86de9 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.59 1997/08/09 00:02:47 dyson Exp $
+ *	$Id: swtch.s,v 1.60 1997/08/26 18:10:33 peter Exp $
  */
 
 #include "npx.h"
@@ -384,7 +384,9 @@ idle_loop:
 CROSSJUMPTARGET(_idle)
 
 ENTRY(default_halt)
+#ifndef SMP					/* until we have a wakeup IPI */
 	hlt
+#endif
 	ret
 
 /*
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index f749f035cc4c..c21ea8c86de9 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.59 1997/08/09 00:02:47 dyson Exp $
+ *	$Id: swtch.s,v 1.60 1997/08/26 18:10:33 peter Exp $
  */
 
 #include "npx.h"
@@ -384,7 +384,9 @@ idle_loop:
 CROSSJUMPTARGET(_idle)
 
 ENTRY(default_halt)
+#ifndef SMP					/* until we have a wakeup IPI */
 	hlt
+#endif
 	ret
 
 /*
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index f749f035cc4c..c21ea8c86de9 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.59 1997/08/09 00:02:47 dyson Exp $
+ *	$Id: swtch.s,v 1.60 1997/08/26 18:10:33 peter Exp $
  */
 
 #include "npx.h"
@@ -384,7 +384,9 @@ idle_loop:
 CROSSJUMPTARGET(_idle)
 
 ENTRY(default_halt)
+#ifndef SMP					/* until we have a wakeup IPI */
 	hlt
+#endif
 	ret
 
 /*