diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
| commit | a5dd19249607474ed680f16b4f5e8477d2b68689 (patch) | |
| tree | 1aeeef053773c07bc02f3aa637febc80ceb96732 /tools/testing | |
| parent | x86/vdso: Emit a GNU hash (diff) | |
| parent | Revert "sched/x86_64: Don't save flags on context switch" (diff) | |
| download | linux-dev-a5dd19249607474ed680f16b4f5e8477d2b68689.tar.xz linux-dev-a5dd19249607474ed680f16b4f5e8477d2b68689.zip | |
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c index 7f0c756993af..3d7dc6afc3f8 100644 --- a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c @@ -191,7 +191,7 @@ int main(int argc, char *argv[]) if (res > 0) { atomic_set(&requeued, 1); break; - } else if (res > 0) { + } else if (res < 0) { error("FUTEX_CMP_REQUEUE_PI failed\n", errno); ret = RET_ERROR; break; |