summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-28 10:09:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-28 10:09:53 -0700
commit30b4f0faf47febe478e29dbbffd17bc35b350f22 (patch)
treeacf136bbaba48910b9c2942382739b6ae549ff8d /tools
parentd8132e08d25a47e2d5156aa2268cd1cd9b0d6c0d (diff)
parentfee50f3c8427aacabfb603229bf0a9056c3f2638 (diff)
downloadop-kernel-dev-30b4f0faf47febe478e29dbbffd17bc35b350f22.zip
op-kernel-dev-30b4f0faf47febe478e29dbbffd17bc35b350f22.tar.gz
Merge tag 'linux-kselftest-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fix from Shuah Khan. * tag 'linux-kselftest-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/futex: Fix futex_cmp_requeue_pi() error handling
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c2
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 7f0c756..3d7dc6a 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;
OpenPOWER on IntegriCloud