openrisc: use generic sys_execve
Jonas Bonn [Fri, 19 Oct 2012 16:25:36 +0000 (18:25 +0200)]
Signed-off-by: Jonas Bonn <jonas@southpole.se>

arch/openrisc/include/uapi/asm/unistd.h
arch/openrisc/kernel/entry.S
arch/openrisc/kernel/process.c

index 437bdbb..5db7bc0 100644 (file)
@@ -20,6 +20,8 @@
 
 #define sys_mmap2 sys_mmap_pgoff
 
+#define __ARCH_WANT_SYS_EXECVE
+
 #include <asm-generic/unistd.h>
 
 #define __NR_or1k_atomic __NR_arch_specific_syscall
index dce86ae..c60a09d 100644 (file)
@@ -1083,10 +1083,6 @@ ENTRY(sys_fork)
        l.j     _fork_save_extra_regs_and_call
         l.addi r3,r1,0
 
-ENTRY(sys_execve)
-       l.j     _sys_execve
-        l.addi r6,r1,0
-
 ENTRY(sys_sigaltstack)
        l.j     _sys_sigaltstack
         l.addi r5,r1,0
index a0f467e..e0874b8 100644 (file)
@@ -251,30 +251,6 @@ void dump_elf_thread(elf_greg_t *dest, struct pt_regs* regs)
        dest[35] = 0;
 }
 
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage long _sys_execve(const char __user *name,
-                           const char __user * const __user *argv,
-                           const char __user * const __user *envp,
-                           struct pt_regs *regs)
-{
-       int error;
-       struct filename *filename;
-
-       filename = getname(name);
-       error = PTR_ERR(filename);
-
-       if (IS_ERR(filename))
-               goto out;
-
-       error = do_execve(filename->name, argv, envp, regs);
-       putname(filename);
-
-out:
-       return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
        /* TODO */