aboutsummaryrefslogtreecommitdiffstats
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 14:51:08 -0700
commit5391cb09f10c98af52458b4fd6e331a6465797f7 (patch)
tree09f6f3a41803e1a7b19999a4022689449d7ac1b7
parentee0ab40d6810a03cbd74715889dad558c5f9f02d (diff)
downloadkernel_samsung_smdk4412-5391cb09f10c98af52458b4fd6e331a6465797f7.zip
kernel_samsung_smdk4412-5391cb09f10c98af52458b4fd6e331a6465797f7.tar.gz
kernel_samsung_smdk4412-5391cb09f10c98af52458b4fd6e331a6465797f7.tar.bz2
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>
-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 f445e98..cfabc3d 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