- Move some common code out of sched_fork_exit() and back into fork_exit().

1 files changed, 4 insertions, 15 deletions

diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index a4b1e08..7e368bb 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -1410,27 +1410,16 @@ sched_throw(struct thread *td)
 }
 
 void
-sched_fork_exit(struct thread *ctd)
+sched_fork_exit(struct thread *td)
 {
-	struct thread *td;
 
 	/*
 	 * Finish setting up thread glue so that it begins execution in a
 	 * non-nested critical section with sched_lock held but not recursed.
 	 */
-	ctd->td_oncpu = PCPU_GET(cpuid);
-	sched_lock.mtx_lock = (uintptr_t)ctd;
-	THREAD_LOCK_ASSERT(ctd, MA_OWNED | MA_NOTRECURSED);
-	/*
-	 * Processes normally resume in mi_switch() after being
-	 * cpu_switch()'ed to, but when children start up they arrive here
-	 * instead, so we must do much the same things as mi_switch() would.
-	 */
-	if ((td = PCPU_GET(deadthread))) {
-		PCPU_SET(deadthread, NULL);
-		thread_stash(td);
-	}
-	thread_unlock(ctd);
+	td->td_oncpu = PCPU_GET(cpuid);
+	sched_lock.mtx_lock = (uintptr_t)td;
+	THREAD_LOCK_ASSERT(td, MA_OWNED | MA_NOTRECURSED);
 }
 
 #define KERN_SWITCH_INCLUDE 1