diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-12-09 19:01:53 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-09 16:28:34 -0800 |
| commit | 11cf88bd0b8165b65aaabaee0977e9a3ad474ab7 (patch) | |
| tree | 33e74a88baf24ee971282ded562b78db40749bb9 /arch/x86/kernel/process_64.c | |
| parent | 27f59559d63375a4d59e7c720a439d9f0b47edad (diff) | |
| download | blackbird-op-linux-11cf88bd0b8165b65aaabaee0977e9a3ad474ab7.tar.gz blackbird-op-linux-11cf88bd0b8165b65aaabaee0977e9a3ad474ab7.zip | |
x86: Merge sys_execve
Change 32-bit sys_execve to PTREGSCALL3, and merge with 64-bit.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1260403316-5679-4-git-send-email-brgerst@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index c95c8f4e790a..671960d82587 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -520,25 +520,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) return prev_p; } -/* - * sys_execve() executes a new program. - */ -asmlinkage -long sys_execve(char __user *name, char __user * __user *argv, - char __user * __user *envp, struct pt_regs *regs) -{ - long error; - char *filename; - - filename = getname(name); - error = PTR_ERR(filename); - if (IS_ERR(filename)) - return error; - error = do_execve(filename, argv, envp, regs); - putname(filename); - return error; -} - void set_personality_64bit(void) { /* inherit personality from parent */ |
