summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:44:15 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:44:15 -0500
commita2b6dfaef0dc04143e8b50bdd2de16877cd69629 (patch)
tree88e5add418352d39c53930613962bc8dd252be04
parent1e93f66831b31d36efe69099ffee33d94e5a3af9 (diff)
parente3cb7e9f0d826b052b519f1ea18a1bd1718a6016 (diff)
downloadlinux-3.10-a2b6dfaef0dc04143e8b50bdd2de16877cd69629.tar.gz
linux-3.10-a2b6dfaef0dc04143e8b50bdd2de16877cd69629.tar.bz2
linux-3.10-a2b6dfaef0dc04143e8b50bdd2de16877cd69629.zip
Merge branch 'arch-tile' into no-rebases
-rw-r--r--arch/tile/kernel/compat_signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index 210a9bbae96..2e4cc69224a 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -248,7 +248,7 @@ long compat_sys_rt_sigreturn(void)
if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
goto badframe;
- if (compat_sys_sigaltstack(&frame->uc.uc_stack, NULL) != 0)
+ if (compat_sys_sigaltstack(&frame->uc.uc_stack, NULL) == -EFAULT)
goto badframe;
return 0;