diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index bc8bc527fc8e..17972b9b28f6 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -224,17 +224,15 @@ cpu_set_fork_handler(td, func, arg)
 	td->td_pcb->pcb_context[2] = (u_long) arg;
 }
 
-/*
- * cpu_exit is called as the last action during exit.
- * We release the address space of the process, block interrupts,
- * and call switch_exit.  switch_exit switches to proc0's PCB and stack,
- * then jumps into the middle of cpu_switch, as if it were switching
- * from proc0.
- */
 void
 cpu_exit(struct thread *td)
 {
 
+	/*
+	 * XXX: Should this be in thread_exit instead?  If so,
+	 * alpha_fpstate_save() should be in cpu_set_upcall()
+	 * as well.
+	 */
 	alpha_fpstate_drop(td);
 }
 
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index 56dabfb51fff..f8fdb9498930 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/vm_machdep.c
@@ -297,6 +297,7 @@ void
 cpu_exit(struct thread *td)
 {
 
+	/* XXX: Should this be in cpu_thread_exit() instead? */
 	/* Throw away the high FP registers. */
 	ia64_highfp_drop(td);
 }
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index acd864512388..654a4be2d181 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -182,13 +182,6 @@ cpu_set_fork_handler(td, func, arg)
 	cf->cf_arg0 = (register_t)arg;
 }
 
-/*
- * cpu_exit is called as the last action during exit.
- * We release the address space of the process, block interrupts,
- * and call switch_exit.  switch_exit switches to proc0's PCB and stack,
- * then jumps into the middle of cpu_switch, as if it were switching
- * from proc0.
- */
 void
 cpu_exit(td)
 	register struct thread *td;
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index acd864512388..654a4be2d181 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -182,13 +182,6 @@ cpu_set_fork_handler(td, func, arg)
 	cf->cf_arg0 = (register_t)arg;
 }
 
-/*
- * cpu_exit is called as the last action during exit.
- * We release the address space of the process, block interrupts,
- * and call switch_exit.  switch_exit switches to proc0's PCB and stack,
- * then jumps into the middle of cpu_switch, as if it were switching
- * from proc0.
- */
 void
 cpu_exit(td)
 	register struct thread *td;