Commit 30b4f0fa authored Jul 28, 2015 by Linus Torvalds

Merge tag 'linux-kselftest-4.2-rc5' of...

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

parents d8132e08 fee50f3c

tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;