summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2016-01-09 18:07:48 +0000
committerdchagin <dchagin@FreeBSD.org>2016-01-09 18:07:48 +0000
commit1fd2c934ac07eee4e5facac548920bfa0e5b64fa (patch)
treeffbab5aa19e7c44341b02c7aea5706db28871b6a /sys/i386
parent76b321901e9738ed7f461424d487da138969be2a (diff)
downloadFreeBSD-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/i386')
-rw-r--r--sys/i386/linux/linux_machdep.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
index 784a621..c9f969b 100644
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -104,7 +104,6 @@ int
linux_execve(struct thread *td, struct linux_execve_args *args)
{
struct image_args eargs;
- struct vmspace *oldvmspace;
char *newpath;
int error;
@@ -115,19 +114,11 @@ linux_execve(struct thread *td, struct linux_execve_args *args)
printf(ARGS(execve, "%s"), newpath);
#endif
- error = pre_execve(td, &oldvmspace);
- if (error != 0) {
- free(newpath, M_TEMP);
- return (error);
- }
error = exec_copyin_args(&eargs, newpath, UIO_SYSSPACE,
args->argp, args->envp);
free(newpath, 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);
}
OpenPOWER on IntegriCloud