Commit 5622eb20 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

futex: Rename futex_wait_queue_me() 



In order to prepare introducing these symbols into the global
namespace; rename them:

  s/futex_wait_queue_me/futex_wait_queue/g

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarAndré Almeida <andrealmeid@collabora.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAndré Almeida <andrealmeid@collabora.com>
Link: https://lore.kernel.org/r/20210923171111.300673-5-andrealmeid@collabora.com
parent bce760d3

kernel/futex/core.c

+5 −5
Original line number Diff line number Diff line
@@ -2787,12 +2787,12 @@ static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked) 
}



/**

 * futex_wait_queue_me() - futex_queue() and wait for wakeup, timeout, or signal

 * futex_wait_queue() - futex_queue() and wait for wakeup, timeout, or signal

 * @hb:		the futex hash bucket, must be locked by the caller

 * @q:		the futex_q to queue up on

 * @timeout:	the prepared hrtimer_sleeper, or null for no timeout

 */

static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,

static void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q,

				struct hrtimer_sleeper *timeout)

{

	/*
@@ -2919,7 +2919,7 @@ int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val, ktime_t *abs_time 
		goto out;



	/* futex_queue and wait for wakeup, timeout, or a signal. */

	futex_wait_queue_me(hb, &q, to);

	futex_wait_queue(hb, &q, to);



	/* If we were woken (and unqueued), we succeeded, whatever. */

	ret = 0;
@@ -3347,7 +3347,7 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, 
 * without one, the pi logic would not know which task to boost/deboost, if

 * there was a need to.

 *

 * We call schedule in futex_wait_queue_me() when we enqueue and return there

 * We call schedule in futex_wait_queue() when we enqueue and return there

 * via the following--

 * 1) wakeup on uaddr2 after an atomic lock acquisition by futex_requeue()

 * 2) wakeup on uaddr2 after a requeue
@@ -3427,7 +3427,7 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, 
	}



	/* Queue the futex_q, drop the hb lock, wait for wakeup. */

	futex_wait_queue_me(hb, &q, to);

	futex_wait_queue(hb, &q, to);



	switch (futex_requeue_pi_wakeup_sync(&q)) {

	case Q_REQUEUE_PI_IGNORE: