[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210915141524.985747253@infradead.org>
Date: Wed, 15 Sep 2021 16:07:16 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: andrealmeid@...labora.com, tglx@...utronix.de, mingo@...hat.com,
dvhart@...radead.org, rostedt@...dmis.org, bigeasy@...utronix.de
Cc: linux-kernel@...r.kernel.org, peterz@...radead.org,
kernel@...labora.com, krisman@...labora.com,
linux-api@...r.kernel.org, libc-alpha@...rceware.org,
mtk.manpages@...il.com, dave@...olabs.net, arnd@...db.de
Subject: [PATCH 06/20] futex: Rename __unqueue_futex()
In order to prepare introducing these symbols into the global
namespace; rename:
s/__unqueue_futex/__futex_unqueue/g
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
---
kernel/futex/core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -1470,12 +1470,12 @@ static int futex_lock_pi_atomic(u32 __us
}
/**
- * __unqueue_futex() - Remove the futex_q from its futex_hash_bucket
+ * __futex_unqueue() - Remove the futex_q from its futex_hash_bucket
* @q: The futex_q to unqueue
*
* The q->lock_ptr must not be NULL and must be held by the caller.
*/
-static void __unqueue_futex(struct futex_q *q)
+static void __futex_unqueue(struct futex_q *q)
{
struct futex_hash_bucket *hb;
@@ -1502,13 +1502,13 @@ static void mark_wake_futex(struct wake_
return;
get_task_struct(p);
- __unqueue_futex(q);
+ __futex_unqueue(q);
/*
* The waiting task can free the futex_q as soon as q->lock_ptr = NULL
* is written, without taking any locks. This is possible in the event
* of a spurious wakeup, for example. A memory barrier is required here
* to prevent the following store to lock_ptr from getting ahead of the
- * plist_del in __unqueue_futex().
+ * plist_del in __futex_unqueue().
*/
smp_store_release(&q->lock_ptr, NULL);
@@ -1958,7 +1958,7 @@ void requeue_pi_wake_futex(struct futex_
{
q->key = *key;
- __unqueue_futex(q);
+ __futex_unqueue(q);
WARN_ON(!q->rt_waiter);
q->rt_waiter = NULL;
@@ -2522,7 +2522,7 @@ static int futex_unqueue(struct futex_q
spin_unlock(lock_ptr);
goto retry;
}
- __unqueue_futex(q);
+ __futex_unqueue(q);
BUG_ON(q->pi_state);
@@ -2539,7 +2539,7 @@ static int futex_unqueue(struct futex_q
*/
static void futex_unqueue_pi(struct futex_q *q)
{
- __unqueue_futex(q);
+ __futex_unqueue(q);
BUG_ON(!q->pi_state);
put_pi_state(q->pi_state);
Powered by blists - more mailing lists