c6x: switch to generic sys_execve

Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/c6x/include/asm/syscalls.h b/arch/c6x/include/asm/syscalls.h
index aed53da703c9ae7bb3b78e1b2d285fefd4ecaa0d..e7b8991dc07c69c25425fce66c16306dcede12d1 100644 (file)
--- a/arch/c6x/include/asm/syscalls.h
+++ b/arch/c6x/include/asm/syscalls.h
@@ -44,11 +44,6 @@ extern int sys_cache_sync(unsigned long s, unsigned long e);
 struct pt_regs;
 
 extern asmlinkage long sys_c6x_clone(struct pt_regs *regs);
-extern asmlinkage long sys_c6x_execve(const char __user *name,
-                                     const char __user *const __user *argv,
-                                     const char __user *const __user *envp,
-                                     struct pt_regs *regs);
-
 
 #include <asm-generic/syscalls.h>
 

diff --git a/arch/c6x/include/asm/unistd.h b/arch/c6x/include/asm/unistd.h
index 1ce3a6f2372b4fc9638074b3153c05a10d561952..3c131d5888c11253cabb21cce01edbc2df28e25c 100644 (file)
--- a/arch/c6x/include/asm/unistd.h
+++ b/arch/c6x/include/asm/unistd.h
@@ -17,6 +17,7 @@
 #define _ASM_C6X_UNISTD_H
 
 #define __ARCH_WANT_KERNEL_EXECVE
+#define __ARCH_WANT_SYS_EXECVE
 
 /* Use the standard ABI for syscalls. */
 #include <asm-generic/unistd.h>

diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S
index 32e3683da71807979c727199edd639411e919c16..5449c36018fe2d269b2daaa162a25a39bfa53c9b 100644 (file)
--- a/arch/c6x/kernel/entry.S
+++ b/arch/c6x/kernel/entry.S
@@ -647,29 +647,6 @@ ENTRY(sys_rt_sigreturn)
 #endif
 ENDPROC(sys_rt_sigreturn)
 
-ENTRY(sys_execve)
-       ADDAW   .D2     SP,2,B6         ; put regs addr in 4th parameter
-                                       ; & adjust regs stack addr
-       LDW     .D2T2   *+SP(REGS_B4+8),B4
-
-       ;; c6x_execve(char *name, char **argv,
-       ;;            char **envp, struct pt_regs *regs)
-#ifdef CONFIG_C6X_BIG_KERNEL
- ||    MVKL    .S1     sys_c6x_execve,A0
-       MVKH    .S1     sys_c6x_execve,A0
-       B       .S2X    A0
-#else
- ||    B       .S2     sys_c6x_execve
-#endif
-       STW     .D2T2   B3,*SP--[2]
-       ADDKPC  .S2     ret_from_c6x_execve,B3,3
-
-ret_from_c6x_execve:
-       LDW     .D2T2   *++SP[2],B3
-       NOP     4
-       BNOP    .S2     B3,5
-ENDPROC(sys_execve)
-
 ENTRY(sys_pread_c6x)
        MV      .D2X    A8,B7
 #ifdef CONFIG_C6X_BIG_KERNEL

diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c
index d2ffc9bdaba1eb86a1167d066272ecaf325adf8a..f98616d92f2d9970d35434d84ddf9bfe45ed1dbf 100644 (file)
--- a/arch/c6x/kernel/process.c
+++ b/arch/c6x/kernel/process.c
@@ -207,28 +207,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
        return 0;
 }
 
-/*
- * c6x_execve() executes a new program.
- */
-SYSCALL_DEFINE4(c6x_execve, const char __user *, name,
-               const char __user *const __user *, argv,
-               const char __user *const __user *, envp,
-               struct pt_regs *, regs)
-{
-       int error;
-       char *filename;
-
-       filename = getname(name);
-       error = PTR_ERR(filename);
-       if (IS_ERR(filename))
-               goto out;
-
-       error = do_execve(filename, argv, envp, regs);
-       putname(filename);
-out:
-       return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
        return p->thread.wchan;