summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKirill Tkhai <tkhai@yandex.ru>2013-07-26 01:17:15 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-13 15:42:49 -0700
commit5d8bce850e56ccbfbf9d8c8d6db3e8c229c7b9bb (patch)
tree5c4f35d3b2b540c1096a5ccf9297de39e63e4d9e /arch
parent81cc233562f1b23db5bae2699f2f69e1f6dc9408 (diff)
downloadlwn-5d8bce850e56ccbfbf9d8c8d6db3e8c229c7b9bb.tar.gz
lwn-5d8bce850e56ccbfbf9d8c8d6db3e8c229c7b9bb.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-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