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 19:28:34 -0500 |
commit | 11cf88bd0b8165b65aaabaee0977e9a3ad474ab7 (patch) | |
tree | 33e74a88baf24ee971282ded562b78db40749bb9 /arch/x86/kernel/process_64.c | |
parent | 27f59559d63375a4d59e7c720a439d9f0b47edad (diff) |
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) | |||
520 | return prev_p; | 520 | return prev_p; |
521 | } | 521 | } |
522 | 522 | ||
523 | /* | ||
524 | * sys_execve() executes a new program. | ||
525 | */ | ||
526 | asmlinkage | ||
527 | long sys_execve(char __user *name, char __user * __user *argv, | ||
528 | char __user * __user *envp, struct pt_regs *regs) | ||
529 | { | ||
530 | long error; | ||
531 | char *filename; | ||
532 | |||
533 | filename = getname(name); | ||
534 | error = PTR_ERR(filename); | ||
535 | if (IS_ERR(filename)) | ||
536 | return error; | ||
537 | error = do_execve(filename, argv, envp, regs); | ||
538 | putname(filename); | ||
539 | return error; | ||
540 | } | ||
541 | |||
542 | void set_personality_64bit(void) | 523 | void set_personality_64bit(void) |
543 | { | 524 | { |
544 | /* inherit personality from parent */ | 525 | /* inherit personality from parent */ |