diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index acba58b89c8..f897f78b48c 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -757,6 +757,51 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread *
 	}
 }
 
+void
+fork_rfppwait(struct thread *td)
+{
+	struct proc *p, *p2;
+
+	MPASS(td->td_pflags & TDP_RFPPWAIT);
+
+	p = td->td_proc;
+	/*
+	 * Preserve synchronization semantics of vfork.  If
+	 * waiting for child to exec or exit, fork set
+	 * P_PPWAIT on child, and there we sleep on our proc
+	 * (in case of exit).
+	 *
+	 * Do it after the ptracestop() above is finished, to
+	 * not block our debugger until child execs or exits
+	 * to finish vfork wait.
+	 */
+	td->td_pflags &= ~TDP_RFPPWAIT;
+	p2 = td->td_rfppwait_p;
+again:
+	PROC_LOCK(p2);
+	while (p2->p_flag & P_PPWAIT) {
+		PROC_LOCK(p);
+		if (thread_suspend_check_needed()) {
+			PROC_UNLOCK(p2);
+			thread_suspend_check(0);
+			PROC_UNLOCK(p);
+			goto again;
+		} else {
+			PROC_UNLOCK(p);
+		}
+		cv_timedwait(&p2->p_pwait, &p2->p_mtx, hz);
+	}
+	PROC_UNLOCK(p2);
+
+	if (td->td_dbgflags & TDB_VFORK) {
+		PROC_LOCK(p);
+		if (p->p_ptevents & PTRACE_VFORK)
+			ptracestop(td, SIGTRAP, NULL);
+		td->td_dbgflags &= ~TDB_VFORK;
+		PROC_UNLOCK(p);
+	}
+}
+
 int
 fork1(struct thread *td, struct fork_req *fr)
 {
diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
index dda0b214fba..aa6974893d5 100644
--- a/sys/kern/subr_syscall.c
+++ b/sys/kern/subr_syscall.c
@@ -165,7 +165,7 @@ syscallenter(struct thread *td)
 static inline void
 syscallret(struct thread *td, int error)
 {
-	struct proc *p, *p2;
+	struct proc *p;
 	struct syscall_args *sa;
 	ksiginfo_t ksi;
 	int traced, error1;
@@ -230,41 +230,6 @@ syscallret(struct thread *td, int error)
 		PROC_UNLOCK(p);
 	}
 
-	if (__predict_false(td->td_pflags & TDP_RFPPWAIT)) {
-		/*
-		 * Preserve synchronization semantics of vfork.  If
-		 * waiting for child to exec or exit, fork set
-		 * P_PPWAIT on child, and there we sleep on our proc
-		 * (in case of exit).
-		 *
-		 * Do it after the ptracestop() above is finished, to
-		 * not block our debugger until child execs or exits
-		 * to finish vfork wait.
-		 */
-		td->td_pflags &= ~TDP_RFPPWAIT;
-		p2 = td->td_rfppwait_p;
-again:
-		PROC_LOCK(p2);
-		while (p2->p_flag & P_PPWAIT) {
-			PROC_LOCK(p);
-			if (thread_suspend_check_needed()) {
-				PROC_UNLOCK(p2);
-				thread_suspend_check(0);
-				PROC_UNLOCK(p);
-				goto again;
-			} else {
-				PROC_UNLOCK(p);
-			}
-			cv_timedwait(&p2->p_pwait, &p2->p_mtx, hz);
-		}
-		PROC_UNLOCK(p2);
-
-		if (td->td_dbgflags & TDB_VFORK) {
-			PROC_LOCK(p);
-			if (p->p_ptevents & PTRACE_VFORK)
-				ptracestop(td, SIGTRAP, NULL);
-			td->td_dbgflags &= ~TDB_VFORK;
-			PROC_UNLOCK(p);
-		}
-	}
+	if (__predict_false(td->td_pflags & TDP_RFPPWAIT))
+		fork_rfppwait(td);
 }
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 96fe06f840f..122edd08b50 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1026,6 +1026,7 @@ int	enterthispgrp(struct proc *p, struct pgrp *pgrp);
 void	faultin(struct proc *p);
 void	fixjobc(struct proc *p, struct pgrp *pgrp, int entering);
 int	fork1(struct thread *, struct fork_req *);
+void	fork_rfppwait(struct thread *);
 void	fork_exit(void (*)(void *, struct trapframe *), void *,
 	    struct trapframe *);
 void	fork_return(struct thread *, struct trapframe *);