diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-10-28 15:04:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-10-29 08:42:28 +0100 |
| commit | 977b9a00541929973fddfbc2f5e932469f7cdc81 (patch) | |
| tree | 50885bdc977a6fa822b5419114e4ea44cfc1d480 /kernel/sched/core.c | |
| parent | af13e5e437dc2eb8a3291aad70fc80d9cc78bc73 (diff) | |
| parent | fd57572253bc356330dbe5b233c2e1d8426c66fd (diff) | |
Merge branch 'linus/master' into sched/core, to resolve conflict
Conflicts:
kernel/sched/ext.c
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index fd9ff697fd90..67b5f2faab36 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8471,10 +8471,12 @@ int sched_cpu_dying(unsigned int cpu) sched_tick_stop(cpu); rq_lock_irqsave(rq, &rf); + update_rq_clock(rq); if (rq->nr_running != 1 || rq_has_pinned_tasks(rq)) { WARN(true, "Dying CPU not properly vacated!"); dump_rq_tasks(rq, KERN_WARNING); } + dl_server_stop(&rq->fair_server); rq_unlock_irqrestore(rq, &rf); calc_load_migrate(rq); |