Skip to content

Commit

Permalink
futex: Rename mark_wake_futex()
Browse files Browse the repository at this point in the history
In order to prepare introducing these symbols into the global
namespace; rename:

  s/mark_wake_futex/futex_wake_mark/g

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: André Almeida <andrealmeid@collabora.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: André Almeida <andrealmeid@collabora.com>
Link: https://lore.kernel.org/r/20210923171111.300673-13-andrealmeid@collabora.com
  • Loading branch information
Peter Zijlstra committed Oct 7, 2021
1 parent f56a76f commit 95c336a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions kernel/futex/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ static void __futex_unqueue(struct futex_q *q)
* must ensure to later call wake_up_q() for the actual
* wakeups to occur.
*/
static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)
static void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q)
{
struct task_struct *p = q->task;

Expand Down Expand Up @@ -818,7 +818,7 @@ int futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset)
if (!(this->bitset & bitset))
continue;

mark_wake_futex(&wake_q, this);
futex_wake_mark(&wake_q, this);
if (++ret >= nr_wake)
break;
}
Expand Down Expand Up @@ -933,7 +933,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2,
ret = -EINVAL;
goto out_unlock;
}
mark_wake_futex(&wake_q, this);
futex_wake_mark(&wake_q, this);
if (++ret >= nr_wake)
break;
}
Expand All @@ -947,7 +947,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2,
ret = -EINVAL;
goto out_unlock;
}
mark_wake_futex(&wake_q, this);
futex_wake_mark(&wake_q, this);
if (++op_ret >= nr_wake2)
break;
}
Expand Down Expand Up @@ -1489,7 +1489,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2,
/* Plain futexes just wake or requeue and are done */
if (!requeue_pi) {
if (++task_count <= nr_wake)
mark_wake_futex(&wake_q, this);
futex_wake_mark(&wake_q, this);
else
requeue_futex(this, hb1, hb2, &key2);
continue;
Expand Down

0 comments on commit 95c336a

Please sign in to comment.