The following commit has been merged into the sched/core branch of tip: Commit-ID: 82845683ca6a15fe8c7912c6264bb0e84ec6f5fb Gitweb: https://git.kernel.org/tip/82845683ca6a15fe8c7912c6264bb0e84ec6f5fb Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Tue, 19 Sep 2023 10:31:15 +02:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 19 Sep 2023 10:32:15 +02:00 sched/fair: Rename check_preempt_wakeup() to check_preempt_wakeup_fair() Other scheduling classes already postfix their similar methods with the class name. Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> --- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d087787..aeaf31e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7994,7 +7994,7 @@ static void set_next_buddy(struct sched_entity *se) /* * Preempt the current task with a newly woken task if needed: */ -static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) +static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int wake_flags) { struct task_struct *curr = rq->curr; struct sched_entity *se = &curr->se, *pse = &p->se; @@ -12830,7 +12830,7 @@ DEFINE_SCHED_CLASS(fair) = { .yield_task = yield_task_fair, .yield_to_task = yield_to_task_fair, - .check_preempt_curr = check_preempt_wakeup, + .check_preempt_curr = check_preempt_wakeup_fair, .pick_next_task = __pick_next_task_fair, .put_prev_task = put_prev_task_fair,