summaryrefslogtreecommitdiff
path: root/kernel/sched/fair.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2024-08-14 00:25:51 +0200
committerPeter Zijlstra <peterz@infradead.org>2024-09-03 15:26:31 +0200
commit4686cc598f669dea1b50dde1568e6c65c355bc67 (patch)
treee356000b8077d7717665fb81f5750e0ca5805b03 /kernel/sched/fair.c
parentdae4320b29f0bbdae93f7c1f6f80b19f109ca0bc (diff)
downloadlinux-next-4686cc598f669dea1b50dde1568e6c65c355bc67.tar.gz
linux-next-4686cc598f669dea1b50dde1568e6c65c355bc67.zip
sched: Clean up DL server vs core sched
Abide by the simple rule: pick_next_task() := pick_task() + set_next_task(.first = true) This allows us to trivially get rid of server_pick_next() and things collapse nicely. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20240813224015.837303391@infradead.org
Diffstat (limited to 'kernel/sched/fair.c')
-rw-r--r--kernel/sched/fair.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index eaeb8b2ad834..8379100905b8 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -8862,16 +8862,7 @@ static bool fair_server_has_tasks(struct sched_dl_entity *dl_se)
static struct task_struct *fair_server_pick_task(struct sched_dl_entity *dl_se)
{
-#ifdef CONFIG_SMP
return pick_task_fair(dl_se->rq);
-#else
- return NULL;
-#endif
-}
-
-static struct task_struct *fair_server_pick_next(struct sched_dl_entity *dl_se)
-{
- return pick_next_task_fair(dl_se->rq, NULL, NULL);
}
void fair_server_init(struct rq *rq)
@@ -8880,9 +8871,7 @@ void fair_server_init(struct rq *rq)
init_dl_entity(dl_se);
- dl_server_init(dl_se, rq, fair_server_has_tasks, fair_server_pick_next,
- fair_server_pick_task);
-
+ dl_server_init(dl_se, rq, fair_server_has_tasks, fair_server_pick_task);
}
/*