MFC r283544:

When I merged the lemul branch I missied kib@'s r282708 commit.
This is not the final fix as I need properly cleanup thread resources
before other threads suicide.

1 files changed, 5 insertions, 13 deletions

diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c
index 0023727..a28da8d 100644
--- a/sys/compat/linux/linux_emul.c
+++ b/sys/compat/linux/linux_emul.c
@@ -172,27 +172,19 @@ linux_common_execve(struct thread *td, struct image_args *eargs)
 {
 	struct linux_pemuldata *pem;
 	struct epoll_emuldata *emd;
+	struct vmspace *oldvmspace;
 	struct linux_emuldata *em;
 	struct proc *p;
 	int error;
 
 	p = td->td_proc;
 
-	/*
-	 * Unlike FreeBSD abort all other threads before
-	 * proceeding exec.
-	 */
-	PROC_LOCK(p);
-	/* See exit1() comments. */
-	thread_suspend_check(0);
-	while (p->p_flag & P_HADTHREADS) {
-		if (!thread_single(p, SINGLE_EXIT))
-			break;
-		thread_suspend_check(0);
-	}
-	PROC_UNLOCK(p);
+	error = pre_execve(td, &oldvmspace);
+	if (error != 0)
+		return (error);
 
 	error = kern_execve(td, eargs, NULL);
+	post_execve(td, error, oldvmspace);
 	if (error != 0)
 		return (error);