avr32: switch to generic sys_execve()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h
index 157b4bd3d5e50aa23942f5b63640f40c3133d966..641023d1bcb5eb000e7932d72d50a9a8da987f9f 100644 (file)
--- a/arch/avr32/include/asm/unistd.h
+++ b/arch/avr32/include/asm/unistd.h
@@ -39,6 +39,7 @@
 #define __ARCH_WANT_SYS_GETPGRP
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_EXECVE
 
 /*
  * "Conditional" syscalls

diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index 07380c3a4f7821ff69b2b27d912146d0949178e2..09b894d96d6e21aefadab9283a480e0b724f01e9 100644 (file)
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -349,27 +349,6 @@ asmlinkage int sys_vfork(struct pt_regs *regs)
                       0, NULL, NULL);
 }
 
-asmlinkage int sys_execve(const char __user *ufilename,
-                         const char __user *const __user *uargv,
-                         const char __user *const __user *uenvp,
-                         struct pt_regs *regs)
-{
-       int error;
-       struct filename *filename;
-
-       filename = getname(ufilename);
-       error = PTR_ERR(filename);
-       if (IS_ERR(filename))
-               goto out;
-
-       error = do_execve(filename->name, uargv, uenvp, regs);
-       putname(filename);
-
-out:
-       return error;
-}
-
-
 /*
  * This function is supposed to answer the question "who called
  * schedule()?"

diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S
index 0447a3e2ba64b773c108fb7f5db9935329fcbc21..285a61b9194e05cdbc8c750b4662b37c72f737aa 100644 (file)
--- a/arch/avr32/kernel/syscall-stubs.S
+++ b/arch/avr32/kernel/syscall-stubs.S
@@ -50,12 +50,6 @@ __sys_vfork:
        mov     r12, sp
        rjmp    sys_vfork
 
-       .global __sys_execve
-       .type   __sys_execve,@function
-__sys_execve:
-       mov     r9, sp
-       rjmp    sys_execve
-
        .global __sys_mmap2
        .type   __sys_mmap2,@function
 __sys_mmap2:

diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index 6eba53530d1c552ea9813a16419a679c27075415..fc649770681998f72f03d0a302cb8d898224a2cd 100644 (file)
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -24,7 +24,7 @@ sys_call_table:
        .long   sys_creat
        .long   sys_link
        .long   sys_unlink              /* 10 */
-       .long   __sys_execve
+       .long   sys_execve
        .long   sys_chdir
        .long   sys_time
        .long   sys_mknod