sparc32: switch to generic sys_execve()

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

diff --git a/arch/sparc/include/asm/syscalls.h b/arch/sparc/include/asm/syscalls.h
index 4b05df397740df49b7ae53eac21d85af4efc3abf..bf8972adea173329cabc6dc4044d8c6dd8089d7e 100644 (file)
--- a/arch/sparc/include/asm/syscalls.h
+++ b/arch/sparc/include/asm/syscalls.h
@@ -8,8 +8,4 @@ extern asmlinkage long sparc_do_fork(unsigned long clone_flags,
                                     struct pt_regs *regs,
                                     unsigned long stack_size);
 
-#ifndef __arch64__
-extern asmlinkage int sparc_execve(struct pt_regs *regs);
-#endif
-
 #endif /* _SPARC64_SYSCALLS_H */

diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index 32bd0aaeedfa7e8d9f8c60cf4c932041bccad4c6..c3e5d8b6417123b19ff0383abb063d85d82db243 100644 (file)
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -45,8 +45,8 @@
 #define __ARCH_WANT_COMPAT_SYS_TIME
 #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
-#define __ARCH_WANT_SYS_EXECVE
 #endif
+#define __ARCH_WANT_SYS_EXECVE
 
 /*
  * "Conditional" syscalls

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 36b35e54a6de00e2957b2fed563f2c3c630ef8b7..21fd1a8f47d2c57c3f403a7a5ab47eeb88d6cf54 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -806,23 +806,10 @@ sys_nis_syscall:
        call    c_sys_nis_syscall
         mov    %l5, %o7
 
-       .align  4
-       .globl  sys_execve
-sys_execve:
-       mov     %o7, %l5
-       add     %sp, STACKFRAME_SZ, %o0         ! pt_regs *regs arg
-       call    sparc_execve
-        mov    %l5, %o7
-
-       .globl  sunos_execv
 sunos_execv:
-       st      %g0, [%sp + STACKFRAME_SZ + PT_I2]
-
-       call    sparc_execve
-        add    %sp, STACKFRAME_SZ, %o0
-
-       b       ret_sys_call
-        ld     [%sp + STACKFRAME_SZ + PT_I0], %o0
+       .globl  sunos_execv
+       b       sys_execve
+        clr    %i2
 
        .align  4
        .globl  sys_sparc_pipe

diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 72764356d308ed3b93cd02be55465158c6ecc3ee..bf4c6addce7b161aa39b87e50ee5972d324b14e0 100644 (file)
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -476,34 +476,6 @@ int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs)
        return 1;
 }
 
-/*
- * sparc_execve() executes a new program after the asm stub has set
- * things up for us.  This should basically do what I want it to.
- */
-asmlinkage int sparc_execve(struct pt_regs *regs)
-{
-       int error, base = 0;
-       struct filename *filename;
-
-       /* Check for indirect call. */
-       if(regs->u_regs[UREG_G1] == 0)
-               base = 1;
-
-       filename = getname((char __user *)regs->u_regs[base + UREG_I0]);
-       error = PTR_ERR(filename);
-       if(IS_ERR(filename))
-               goto out;
-       error = do_execve(filename->name,
-                         (const char __user *const  __user *)
-                         regs->u_regs[base + UREG_I1],
-                         (const char __user *const  __user *)
-                         regs->u_regs[base + UREG_I2],
-                         regs);
-       putname(filename);
-out:
-       return error;
-}
-
 unsigned long get_wchan(struct task_struct *task)
 {
        unsigned long pc, fp, bias = 0;