From 200281abc10b1d387c74461f5d833bb2ab2645e6 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 30 Dec 2001 23:39:15 +0000
Subject: [PATCH] Revert previous definition of cpu_throw(). Non-MP
 configurations were broken as well.

---
 sys/ia64/ia64/swtch.s      | 2 --
 sys/ia64/ia64/vm_machdep.c | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sys/ia64/ia64/swtch.s b/sys/ia64/ia64/swtch.s
index 24b305c5908a..f165ff3825f0 100644
--- a/sys/ia64/ia64/swtch.s
+++ b/sys/ia64/ia64/swtch.s
@@ -209,8 +209,6 @@ ENTRY(cpu_switch, 0)
 
 	mov	ar.rsc=3		// turn RSE back on
 
-XENTRY(cpu_throw)
-
 #ifdef SMP
 	add	r17 = PC_CPUID, r13
 	movl	r16 = smp_active
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index 6505507687ad..cd21b2a2fc75 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/vm_machdep.c
@@ -301,6 +301,15 @@ cpu_wait(p)
 {
 }
 
+/* Temporary helper */
+void
+cpu_throw(void)
+{
+
+	cpu_switch();
+	panic("cpu_throw() didn't");
+}
+
 /*
  * Dump the machine specific header information at the start of a core dump.
  */