From 5408c0979df30e2d9a9dc4a4a3e9d904774501ad Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 26 Sep 2012 19:28:00 -0400
Subject: [PATCH] --- yaml --- r: 340247 b: refs/heads/master c:
 2f12af35a988082700373acdebe049dfebaf49b6 h: refs/heads/master i:   340245:
 c99199d84e206ca78ffe09956625771d8b6b3c85   340243:
 bf41c8b9e7252e904db2655cdb14a5861626da48   340239:
 f3dc0993a41f0e0c46a599f422ed0de6149df49a v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sparc/Kconfig               |  1 +
 trunk/arch/sparc/kernel/sys_sparc_64.c | 22 ----------------------
 trunk/arch/sparc/kernel/syscalls.S     | 10 +++++-----
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index a83b9711239d..61862911db97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5230429ab1c20c348e17069230c24db8a6b53ca3
+refs/heads/master: 2f12af35a988082700373acdebe049dfebaf49b6
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index ab8bd62b8dbe..e47eb324d77a 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -75,6 +75,7 @@ config SPARC64
 	select HAVE_C_RECORDMCOUNT
 	select NO_BOOTMEM
 	select GENERIC_KERNEL_THREAD
+	select GENERIC_KERNEL_EXECVE
 
 config ARCH_DEFCONFIG
 	string
diff --git a/trunk/arch/sparc/kernel/sys_sparc_64.c b/trunk/arch/sparc/kernel/sys_sparc_64.c
index 11c6c9603e71..adfe60ece05f 100644
--- a/trunk/arch/sparc/kernel/sys_sparc_64.c
+++ b/trunk/arch/sparc/kernel/sys_sparc_64.c
@@ -729,25 +729,3 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig, const struct sigaction __user *, act,
 
 	return ret;
 }
-
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename,
-		  const char *const argv[],
-		  const char *const envp[])
-{
-	long __res;
-	register long __g1 __asm__ ("g1") = __NR_execve;
-	register long __o0 __asm__ ("o0") = (long)(filename);
-	register long __o1 __asm__ ("o1") = (long)(argv);
-	register long __o2 __asm__ ("o2") = (long)(envp);
-	asm volatile ("t 0x6d\n\t"
-		      "sub %%g0, %%o0, %0\n\t"
-		      "movcc %%xcc, %%o0, %0\n\t"
-		      : "=r" (__res), "=&r" (__o0)
-		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1)
-		      : "cc");
-	return __res;
-}
diff --git a/trunk/arch/sparc/kernel/syscalls.S b/trunk/arch/sparc/kernel/syscalls.S
index 624f34162c38..f72c12433869 100644
--- a/trunk/arch/sparc/kernel/syscalls.S
+++ b/trunk/arch/sparc/kernel/syscalls.S
@@ -115,13 +115,13 @@ ret_from_syscall:
 	call	schedule_tail
 	 mov	%g7, %o0
 	ldx	[%sp + PTREGS_OFF + PT_V9_I0], %o0
-	brnz,a,pt	%o0, ret_sys_call
+	brnz,pt	%o0, ret_sys_call
 	 ldx	[%g6 + TI_FLAGS], %l0
-	ldx	[%sp + PTREGS_OFF + PT_V9_G1], %l0
-	call	%l0
+	ldx	[%sp + PTREGS_OFF + PT_V9_G1], %l1
+	call	%l1
 	 ldx	[%sp + PTREGS_OFF + PT_V9_G2], %o0
-	call	do_exit	! will not return
-	 mov	0,%o0
+	ba,pt	%xcc, ret_sys_call
+	 mov	0, %o0
 
 	.globl	sparc_exit
 	.type	sparc_exit,#function