diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-23 13:59:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 13:59:12 +0100 |
| commit | 987c66636dd19938225c3d504e01fca2f0234b97 (patch) | |
| tree | 9e06e4a3c5cc9ffcec22fc05beb3fe05357cc4ee /kernel/time/tick-sched.c | |
| parent | e51da37ab656a3b82b09acbd215f035669ae5af5 (diff) | |
| parent | 8b313d717bcf4f944fb46fe4ed4d8680bdbc5648 (diff) | |
| download | linux-next-987c66636dd19938225c3d504e01fca2f0234b97.tar.gz linux-next-987c66636dd19938225c3d504e01fca2f0234b97.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 98a9cae915c0..6c3fea386713 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -828,8 +828,7 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu) ts->timer_expires_base = basemono; /* - * Keep the periodic tick, when RCU, architecture or irq_work - * requests it. + * Keep the periodic tick, when RCU or irq_work requests it. * Aside of that, check whether the local timer softirq is * pending. If so, its a bad idea to call get_next_timer_interrupt(), * because there is an already expired timer, so it will request @@ -837,8 +836,8 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu) * minimal delta, which brings us back to this place * immediately. Lather, rinse and repeat... */ - if (rcu_needs_cpu() || arch_needs_cpu() || - irq_work_needs_cpu() || local_timer_softirq_pending()) { + if (rcu_needs_cpu() || irq_work_needs_cpu() || + local_timer_softirq_pending()) { next_tick = basemono + TICK_NSEC; } else { /* |