diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-18 22:48:18 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-23 22:05:43 -0400 |
| commit | 27aedbd52fb78bbead55c81a8dd906afd405c3fc (patch) | |
| tree | f6ba706c7c3aa554448126ed422cd3d75a5fa990 | |
| parent | 995218555433b260b58059802e1c01f35b4cd860 (diff) | |
hexagon: switch to generic sys_execve()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/hexagon/include/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/hexagon/kernel/syscall.c | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/arch/hexagon/include/asm/unistd.h b/arch/hexagon/include/asm/unistd.h index c0d5565030ae..acbd5adc9814 100644 --- a/arch/hexagon/include/asm/unistd.h +++ b/arch/hexagon/include/asm/unistd.h | |||
| @@ -27,5 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #define sys_mmap2 sys_mmap_pgoff | 29 | #define sys_mmap2 sys_mmap_pgoff |
| 30 | #define __ARCH_WANT_SYS_EXECVE | ||
| 30 | 31 | ||
| 31 | #include <asm-generic/unistd.h> | 32 | #include <asm-generic/unistd.h> |
diff --git a/arch/hexagon/kernel/syscall.c b/arch/hexagon/kernel/syscall.c index 120f1a5e9f3d..e28f4e5a6a7a 100644 --- a/arch/hexagon/kernel/syscall.c +++ b/arch/hexagon/kernel/syscall.c | |||
| @@ -35,25 +35,6 @@ | |||
| 35 | * See signal.c for signal-related system call wrappers. | 35 | * See signal.c for signal-related system call wrappers. |
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | asmlinkage int sys_execve(char __user *ufilename, | ||
| 39 | const char __user *const __user *argv, | ||
| 40 | const char __user *const __user *envp) | ||
| 41 | { | ||
| 42 | struct pt_regs *pregs = current_pt_regs(); | ||
| 43 | struct filename *filename; | ||
| 44 | int retval; | ||
| 45 | |||
| 46 | filename = getname(ufilename); | ||
| 47 | retval = PTR_ERR(filename); | ||
| 48 | if (IS_ERR(filename)) | ||
| 49 | return retval; | ||
| 50 | |||
| 51 | retval = do_execve(filename->name, argv, envp, pregs); | ||
| 52 | putname(filename); | ||
| 53 | |||
| 54 | return retval; | ||
| 55 | } | ||
| 56 | |||
| 57 | asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, | 38 | asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, |
| 58 | unsigned long parent_tidp, unsigned long child_tidp) | 39 | unsigned long parent_tidp, unsigned long child_tidp) |
| 59 | { | 40 | { |
