[tip: sched/core] sched/fair: Cleanup pick_task_fair()'s curr

tip-bot2 for Peter Zijlstra
2024-08-18T06:23:15Z

The following commit has been merged into the sched/core branch of tip:

Commit-ID: c97f54fe6d014419e557200ed075cf53b47c5420
Gitweb: https://git.kernel.org/tip/c97f54fe6d014419e557200ed075cf53b47c5420
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 03 Apr 2024 09:50:12 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Sat, 17 Aug 2024 11:06:41 +02:00

sched/fair: Cleanup pick_task_fair()'s curr

With 4c456c9ad334 ("sched/fair: Remove unused 'curr' argument from
pick_next_entity()") curr is no longer being used, so no point in
clearing it.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Tested-by: Valentin Schneider <vschneid@redhat.com>
Link: https://lkml.kernel.org/r/20240727105028.614707623@infradead.org
---
kernel/sched/fair.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 7ba1ca5..175ccec 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -8463,15 +8463,9 @@ again:
return NULL;

do {
- struct sched_entity *curr = cfs_rq->curr;
-
/* When we pick for a remote RQ, we'll not have done put_prev_entity() */
- if (curr) {
- if (curr->on_rq)
- update_curr(cfs_rq);
- else
- curr = NULL;
- }
+ if (cfs_rq->curr && cfs_rq->curr->on_rq)
+ update_curr(cfs_rq);

if (unlikely(check_cfs_rq_runtime(cfs_rq)))
goto again;