diff options
| author | Al Viro | 2012-11-28 20:44:15 -0600 |
|---|---|---|
| committer | Al Viro | 2012-11-28 20:44:15 -0600 |
| commit | a2b6dfaef0dc04143e8b50bdd2de16877cd69629 (patch) | |
| tree | 88e5add418352d39c53930613962bc8dd252be04 /arch/tile | |
| parent | 1e93f66831b31d36efe69099ffee33d94e5a3af9 (diff) | |
| parent | e3cb7e9f0d826b052b519f1ea18a1bd1718a6016 (diff) | |
| download | am43-linux-kernel-a2b6dfaef0dc04143e8b50bdd2de16877cd69629.tar.gz am43-linux-kernel-a2b6dfaef0dc04143e8b50bdd2de16877cd69629.tar.xz am43-linux-kernel-a2b6dfaef0dc04143e8b50bdd2de16877cd69629.zip | |
Merge branch 'arch-tile' into no-rebases
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/kernel/compat_signal.c | 2 |
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) | |||
| 248 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) | 248 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) |
| 249 | goto badframe; | 249 | goto badframe; |
| 250 | 250 | ||
| 251 | if (compat_sys_sigaltstack(&frame->uc.uc_stack, NULL) != 0) | 251 | if (compat_sys_sigaltstack(&frame->uc.uc_stack, NULL) == -EFAULT) |
| 252 | goto badframe; | 252 | goto badframe; |
| 253 | 253 | ||
| 254 | return 0; | 254 | return 0; |