Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fe866ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Fix spurious wakeup for requeue_pi really
parents bce8fc4c 11df6ddd

kernel/futex.c

+1 −5
Original line number Diff line number Diff line
@@ -2127,7 +2127,7 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, 
		plist_del(&q->list, &q->list.plist);



		/* Handle spurious wakeups gracefully */

		ret = -EAGAIN;

		ret = -EWOULDBLOCK;

		if (timeout && !timeout->task)

			ret = -ETIMEDOUT;

		else if (signal_pending(current))
@@ -2208,7 +2208,6 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, 
	debug_rt_mutex_init_waiter(&rt_waiter);

	rt_waiter.task = NULL;



retry:

	key2 = FUTEX_KEY_INIT;

	ret = get_futex_key(uaddr2, fshared, &key2, VERIFY_WRITE);

	if (unlikely(ret != 0))
@@ -2303,9 +2302,6 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, 
out_key2:

	put_futex_key(fshared, &key2);



	/* Spurious wakeup ? */

	if (ret == -EAGAIN)

		goto retry;

out:

	if (to) {

		hrtimer_cancel(&to->timer);