diff --git a/[refs] b/[refs] index 22c524b8e841..8d3005d75347 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 995218555433b260b58059802e1c01f35b4cd860 +refs/heads/master: 27aedbd52fb78bbead55c81a8dd906afd405c3fc diff --git a/trunk/arch/hexagon/include/asm/unistd.h b/trunk/arch/hexagon/include/asm/unistd.h index c0d5565030ae..acbd5adc9814 100644 --- a/trunk/arch/hexagon/include/asm/unistd.h +++ b/trunk/arch/hexagon/include/asm/unistd.h @@ -27,5 +27,6 @@ */ #define sys_mmap2 sys_mmap_pgoff +#define __ARCH_WANT_SYS_EXECVE #include diff --git a/trunk/arch/hexagon/kernel/syscall.c b/trunk/arch/hexagon/kernel/syscall.c index 120f1a5e9f3d..e28f4e5a6a7a 100644 --- a/trunk/arch/hexagon/kernel/syscall.c +++ b/trunk/arch/hexagon/kernel/syscall.c @@ -35,25 +35,6 @@ * See signal.c for signal-related system call wrappers. */ -asmlinkage int sys_execve(char __user *ufilename, - const char __user *const __user *argv, - const char __user *const __user *envp) -{ - struct pt_regs *pregs = current_pt_regs(); - struct filename *filename; - int retval; - - filename = getname(ufilename); - retval = PTR_ERR(filename); - if (IS_ERR(filename)) - return retval; - - retval = do_execve(filename->name, argv, envp, pregs); - putname(filename); - - return retval; -} - asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, unsigned long parent_tidp, unsigned long child_tidp) {