summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-11-01 09:52:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-11-01 09:52:32 -0800
commit46fec1c3029b552ec63b2d01af9d43a386f043ea (patch)
tree2f46152aaae331460fb9eae7ad650800cb52678c /kernel
parent7a3d2740d1b1b5ed8d22e1e5430de3b5046cf6a9 (diff)
parentb327e63683a2b894b500027375342c25222b58ef (diff)
Merge tag 'sched-urgent-2026-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar: - Fix a false positive cputime related warning in kcpustat_dyntick_stop() that can trigger sporadically after a clocksource switch (Stian Halseth) * tag 'sched-urgent-2026-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/cputime: Don't warn when the tick period starts after idle exit
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/cputime.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index 9e0fb8633d82..17f3cbd5d403 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -478,7 +478,12 @@ void kcpustat_dyntick_stop(u64 now, u64 tick_start)
kc->idle_tick_overlap = 0;
}
tick_start = max(tick_start, kc->idle_dyntick_entry);
- if (!WARN_ON_ONCE(now < tick_start))
+ /*
+ * After a switch from the jiffies clocksource the tick can be
+ * armed more than a tick ahead, so the period may not have
+ * started yet.
+ */
+ if (now > tick_start)
kc->idle_tick_overlap += now - tick_start;
kcpustat_idle_stop(kc, now);
kc->idle_dyntick = false;