openrisc: use generic sys_execve

Signed-off-by: Jonas Bonn <jonas@southpole.se>

diff --git a/arch/openrisc/include/uapi/asm/unistd.h b/arch/openrisc/include/uapi/asm/unistd.h
index 437bdbb61b14ce58372710d7177a8e1ba2fd9bb0..5db7bc0fa5a76fcb931cbbb87b86ec1fb40cecff 100644 (file)
--- a/arch/openrisc/include/uapi/asm/unistd.h
+++ b/arch/openrisc/include/uapi/asm/unistd.h
@@ -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

diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
index dce86aef8aba32db4109a5ebf8697d5897555a4f..c60a09df323f3710f1d386afa5d8d4f38dd0beb7 100644 (file)
--- a/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@ -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

diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c
index a0f467e438fcd8100e5be65df46a099a47d51680..e0874b8e09e498f1d95813f49ab03f2c743d08fa 100644 (file)
--- a/arch/openrisc/kernel/process.c
+++ b/arch/openrisc/kernel/process.c
@@ -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 */