diff options
author | dchagin <dchagin@FreeBSD.org> | 2016-01-09 18:07:48 +0000 |
---|---|---|
committer | dchagin <dchagin@FreeBSD.org> | 2016-01-09 18:07:48 +0000 |
commit | 1fd2c934ac07eee4e5facac548920bfa0e5b64fa (patch) | |
tree | ffbab5aa19e7c44341b02c7aea5706db28871b6a /sys/amd64 | |
parent | 76b321901e9738ed7f461424d487da138969be2a (diff) | |
download | FreeBSD-src-1fd2c934ac07eee4e5facac548920bfa0e5b64fa.zip FreeBSD-src-1fd2c934ac07eee4e5facac548920bfa0e5b64fa.tar.gz |
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.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/linux32/linux32_machdep.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index a48592d..b38afb3 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -126,7 +126,6 @@ int linux_execve(struct thread *td, struct linux_execve_args *args) { struct image_args eargs; - struct vmspace *oldvmspace; char *path; int error; @@ -137,19 +136,11 @@ linux_execve(struct thread *td, struct linux_execve_args *args) printf(ARGS(execve, "%s"), path); #endif - error = pre_execve(td, &oldvmspace); - if (error != 0) { - free(path, M_TEMP); - return (error); - } error = freebsd32_exec_copyin_args(&eargs, path, UIO_SYSSPACE, args->argp, args->envp); free(path, M_TEMP); if (error == 0) - error = kern_execve(td, &eargs, NULL); - if (error == 0) error = linux_common_execve(td, &eargs); - post_execve(td, error, oldvmspace); return (error); } |