summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64/sparc64/trap.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc64/sparc64/trap.c')
-rw-r--r--sys/arch/sparc64/sparc64/trap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index 80209b7ac84..75c11621e25 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.77 2012/12/31 06:46:14 guenther Exp $ */
+/* $OpenBSD: trap.c,v 1.78 2013/04/02 13:24:57 kettenis Exp $ */
/* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */
/*
@@ -1238,8 +1238,8 @@ syscall(tf, code, pc)
panic("syscall: trapframe");
#endif
p->p_md.md_tf = tf;
- new = code & (SYSCALL_G7RFLAG | SYSCALL_G2RFLAG);
- code &= ~(SYSCALL_G7RFLAG | SYSCALL_G2RFLAG);
+ new = code & SYSCALL_G2RFLAG;
+ code &= ~SYSCALL_G2RFLAG;
callp = p->p_emul->e_sysent;
nsys = p->p_emul->e_nsysent;
@@ -1320,8 +1320,8 @@ syscall(tf, code, pc)
tf->tf_out[0] = rval[0];
tf->tf_out[1] = rval[1];
if (new) {
- /* jmp %g2 (or %g7, deprecated) on success */
- dest = tf->tf_global[new & SYSCALL_G2RFLAG ? 2 : 7];
+ /* jmp %g2 on success */
+ dest = tf->tf_global[2];
if (dest & 3) {
error = EINVAL;
goto bad;