diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2015-05-25 20:44:46 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2015-05-25 20:44:46 +0000 |
| commit | d707582f83d003562a261106fb43b0eaedbe0a68 (patch) | |
| tree | b5d5457fce8138b09a5295e94fb2db013079d740 /sys/i386 | |
| parent | 781eb7444e5b58344a233e1ed3f96ed145e4a493 (diff) | |
| download | src-d707582f83d003562a261106fb43b0eaedbe0a68.tar.gz src-d707582f83d003562a261106fb43b0eaedbe0a68.zip | |
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.
Tested by: Ruslan Makhmatkhanov
Notes
Notes:
svn path=/head/; revision=283544
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/linux/linux_machdep.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 784a621ebdcd..c9f969bed7f1 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); } |