diff --git a/sys/mips/mips/db_trace.c b/sys/mips/mips/db_trace.c
index a1f40ba276eb..52546b5565e1 100644
--- a/sys/mips/mips/db_trace.c
+++ b/sys/mips/mips/db_trace.c
@@ -168,9 +168,9 @@ stacktrace_subr(register_t pc, register_t sp, register_t ra,
 		subr = (uintptr_t)MipsTLBInvalidException;
 	else if (pcBetween(fork_trampoline, savectx))
 		subr = (uintptr_t)fork_trampoline;
-	else if (pcBetween(savectx, mips_cpu_throw))
+	else if (pcBetween(savectx, cpu_throw))
 		subr = (uintptr_t)savectx;
-	else if (pcBetween(mips_cpu_throw, cpu_switch))
+	else if (pcBetween(cpu_throw, cpu_switch))
 		subr = (uintptr_t)cpu_throw;
 	else if (pcBetween(cpu_switch, MipsSwitchFPState))
 		subr = (uintptr_t)cpu_switch;
diff --git a/sys/mips/mips/swtch.S b/sys/mips/mips/swtch.S
index 0b30570ee4a5..b83b8b86471d 100644
--- a/sys/mips/mips/swtch.S
+++ b/sys/mips/mips/swtch.S
@@ -216,7 +216,7 @@ LEAF(savectx)
 	move	v0, zero
 END(savectx)
 
-NON_LEAF(mips_cpu_throw, CALLFRAME_SIZ, ra)
+NON_LEAF(cpu_throw, CALLFRAME_SIZ, ra)
 	mfc0	t0, MIPS_COP_0_STATUS		# t0 = saved status register
 	nop
 	nop
@@ -227,7 +227,7 @@ NON_LEAF(mips_cpu_throw, CALLFRAME_SIZ, ra)
 						# thread's context, so jump 
 						# right to action
 	nop					# BDSLOT
-END(mips_cpu_throw)
+END(cpu_throw)
 
 /*
  * cpu_switch(struct thread *old, struct thread *new, struct mutex *mtx);
diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c
index 52b90ccaed1a..38121b3f3229 100644
--- a/sys/mips/mips/vm_machdep.c
+++ b/sys/mips/mips/vm_machdep.c
@@ -543,14 +543,6 @@ cpu_set_user_tls(struct thread *td, void *tls_base)
 	return (0);
 }
 
-void
-cpu_throw(struct thread *old, struct thread *new)
-{
-
-	func_2args_asmmacro(&mips_cpu_throw, old, new);
-	panic("mips_cpu_throw() returned");
-}
-
 #ifdef DDB
 #include <ddb/ddb.h>