summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Tkhai <tkhai@yandex.ru>2013-07-26 01:17:15 +0400
committerBen Hutchings <ben@decadent.org.uk>2013-10-26 21:06:10 +0100
commit587e5bf9a64470d080aab287d95c11a43b777cc5 (patch)
tree5e87c0d38c53d5a0b9199879581700f0cf1c245d
parent7af4fd8cf2529729f2981f10a83f7c277c1ec684 (diff)
sparc32: Fix exit flag passed from traced sys_sigreturn
[ Upstream commit 7a3b0f89e3fea680f93932691ca41a68eee7ab5e ] Pass 1 in %o1 to indicate that syscall_trace accounts exit. Signed-off-by: Kirill Tkhai <tkhai@yandex.ru> CC: David Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--arch/sparc/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index f445e98463e6..cfabc3d8821e 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1177,7 +1177,7 @@ sys_sigreturn:
nop
call syscall_trace
- nop
+ mov 1, %o1
1:
/* We don't want to muck with user registers like a