Back out rev 1.240; it is unnecessary. In particular,

p1 == curthread, so _PHOLD(p1) will not have to block
to swap in p1.

Noticed by:	jhb

1 files changed, 3 insertions, 8 deletions

diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 6e47e26..714a1af 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -533,14 +533,8 @@ again:
 	 * p_limit is copy-on-write.  Bump its refcount.
 	 */
 	p2->p_limit = lim_hold(p1->p_limit);
-
-	/*
-	 * We don't need to prevent the parent from being swapped out just yet,
-	 * but this is a convenient point to block to swap it in if needed.
-	 */
-	PROC_UNLOCK(p2);
-	_PHOLD(p1);
 	PROC_UNLOCK(p1);
+	PROC_UNLOCK(p2);
 
 	/* Bump references to the text vnode (for procfs) */
 	if (p2->p_textvp)
@@ -635,8 +629,9 @@ again:
 
 	/*
 	 * This begins the section where we must prevent the parent
-	 * from being swapped.  We already got a hold on the parent earlier.
+	 * from being swapped.
 	 */
+	_PHOLD(p1);
 	PROC_UNLOCK(p1);
 
 	/*