summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/syscalls.S
diff options
context:
space:
mode:
authorAl Viro2012-09-27 01:28:00 +0200
committerAl Viro2012-10-15 01:26:53 +0200
commit2f12af35a988082700373acdebe049dfebaf49b6 (patch)
tree884f364fe18dd47a86bb725afd1cc54ab67ffb97 /arch/sparc/kernel/syscalls.S
parentsparc64: take fprs_write() and friends to start_thread() (diff)
downloadkernel-qcow2-linux-2f12af35a988082700373acdebe049dfebaf49b6.tar.gz
kernel-qcow2-linux-2f12af35a988082700373acdebe049dfebaf49b6.tar.xz
kernel-qcow2-linux-2f12af35a988082700373acdebe049dfebaf49b6.zip
sparc64: switch to generic kernel_execve()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc/kernel/syscalls.S')
-rw-r--r--arch/sparc/kernel/syscalls.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index 624f34162c38..f72c12433869 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/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