summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-08-16 11:15:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-08-16 11:15:23 -0700
commitfd923b32d7614047c8b2acecae3915ec94f7afab (patch)
tree30d7b3414c9b907d554b504e8a5a90a98a801a5d
parent240de1acf318ba53b6d34094030822797c65154a (diff)
parent333238da9a193ffc58792995f3e951e4cb87bfd2 (diff)
downloadlinux-fd923b32d7614047c8b2acecae3915ec94f7afab.tar.gz
linux-fd923b32d7614047c8b2acecae3915ec94f7afab.zip
Merge tag 'sched_urgent_for_v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Borislav Petkov: - Make sure a delayed sched entity's runtime stats are updated at the right time so that it receives the proper lag compensation * tag 'sched_urgent_for_v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Update time before requeueing delayed entities
-rw-r--r--kernel/sched/fair.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d78467ec6ee1..f15f5764818e 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7779,6 +7779,8 @@ requeue_delayed_entity(struct sched_entity *se)
WARN_ON_ONCE(!se->sched_delayed);
WARN_ON_ONCE(!se->on_rq);
+ update_curr(cfs_rq);
+
if (update_entity_lag(cfs_rq, se)) {
cfs_rq->nr_queued--;
if (se != cfs_rq->curr)