]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
sched/fair: Cleanup pick_task_fair()'s curr
authorPeter Zijlstra <peterz@infradead.org>
Wed, 3 Apr 2024 07:50:12 +0000 (09:50 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Sat, 17 Aug 2024 09:06:41 +0000 (11:06 +0200)
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

index 7ba1ca56a63efe23ed4c053da2f0f871f3b339fb..175ccec8c53f8ad97dcf5c801656696c80ed5ab6 100644 (file)
@@ -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;