commit 2f12af35a988082700373acdebe049dfebaf49b6
author Al Viro <viro@zeniv.linux.org.uk> Wed Sep 26 19:28:00 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sun Oct 14 19:26:53 2012 -0400
tree 884f364fe18dd47a86bb725afd1cc54ab67ffb97
parent 5230429ab1c20c348e17069230c24db8a6b53ca3

sparc64: switch to generic kernel_execve()

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

arch/sparc/kernel/syscalls.S

diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index 624f341..f72c124 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -115,13 +115,13 @@
 	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