aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/entry.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-07-10 19:49:28 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-10 19:49:28 -0400
commitbb49bcda15f1bc1a52c7f887db278447f332eaa7 (patch)
treedec754638f3cbc4123e715c42573648859e20735 /arch/sparc64/kernel/entry.S
parentaf166d15c3ad4d501a0c4fb5b4547bb2ba205918 (diff)
[SPARC64]: Add SECCOMP support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/entry.S')
-rw-r--r--arch/sparc64/kernel/entry.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index b51bd14cde44..acc323eef535 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -1552,7 +1552,7 @@ sys_ptrace: add %sp, PTREGS_OFF, %o0
1552 nop 1552 nop
1553 .align 32 1553 .align 32
15541: ldx [%curptr + TI_FLAGS], %l5 15541: ldx [%curptr + TI_FLAGS], %l5
1555 andcc %l5, _TIF_SYSCALL_TRACE, %g0 1555 andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %g0
1556 be,pt %icc, rtrap 1556 be,pt %icc, rtrap
1557 clr %l6 1557 clr %l6
1558 call syscall_trace 1558 call syscall_trace
@@ -1676,7 +1676,7 @@ linux_sparc_syscall32:
1676 1676
1677 srl %i5, 0, %o5 ! IEU1 1677 srl %i5, 0, %o5 ! IEU1
1678 srl %i2, 0, %o2 ! IEU0 Group 1678 srl %i2, 0, %o2 ! IEU0 Group
1679 andcc %l0, _TIF_SYSCALL_TRACE, %g0 ! IEU0 Group 1679 andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %g0 ! IEU0 Group
1680 bne,pn %icc, linux_syscall_trace32 ! CTI 1680 bne,pn %icc, linux_syscall_trace32 ! CTI
1681 mov %i0, %l5 ! IEU1 1681 mov %i0, %l5 ! IEU1
1682 call %l7 ! CTI Group brk forced 1682 call %l7 ! CTI Group brk forced
@@ -1699,7 +1699,7 @@ linux_sparc_syscall:
1699 1699
1700 mov %i3, %o3 ! IEU1 1700 mov %i3, %o3 ! IEU1
1701 mov %i4, %o4 ! IEU0 Group 1701 mov %i4, %o4 ! IEU0 Group
1702 andcc %l0, _TIF_SYSCALL_TRACE, %g0 ! IEU1 Group+1 bubble 1702 andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %g0 ! IEU1 Group+1 bubble
1703 bne,pn %icc, linux_syscall_trace ! CTI Group 1703 bne,pn %icc, linux_syscall_trace ! CTI Group
1704 mov %i0, %l5 ! IEU0 1704 mov %i0, %l5 ! IEU0
17052: call %l7 ! CTI Group brk forced 17052: call %l7 ! CTI Group brk forced
@@ -1727,7 +1727,7 @@ ret_sys_call:
17271: 17271:
1728 cmp %o0, -ERESTART_RESTARTBLOCK 1728 cmp %o0, -ERESTART_RESTARTBLOCK
1729 bgeu,pn %xcc, 1f 1729 bgeu,pn %xcc, 1f
1730 andcc %l0, _TIF_SYSCALL_TRACE, %l6 1730 andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %l6
173180: 173180:
1732 /* System call success, clear Carry condition code. */ 1732 /* System call success, clear Carry condition code. */
1733 andn %g3, %g2, %g3 1733 andn %g3, %g2, %g3
@@ -1742,7 +1742,7 @@ ret_sys_call:
1742 /* System call failure, set Carry condition code. 1742 /* System call failure, set Carry condition code.
1743 * Also, get abs(errno) to return to the process. 1743 * Also, get abs(errno) to return to the process.
1744 */ 1744 */
1745 andcc %l0, _TIF_SYSCALL_TRACE, %l6 1745 andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP), %l6
1746 sub %g0, %o0, %o0 1746 sub %g0, %o0, %o0
1747 or %g3, %g2, %g3 1747 or %g3, %g2, %g3
1748 stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] 1748 stx %o0, [%sp + PTREGS_OFF + PT_V9_I0]