diff options
| author | Mark Brown <broonie@kernel.org> | 2026-08-21 13:56:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-08-21 13:56:38 +0100 |
| commit | d2cac287140d890b72b3a82a643b25465ba60f9a (patch) | |
| tree | a96dcafdbc9c57d89a375032f8b8af52f297c0f5 /kernel | |
| parent | 3b03372426b41970eca731093e8cccf3d3aab784 (diff) | |
| parent | 53158917ea1a0219f6886a0ae10f6f276ecfa2a6 (diff) | |
| download | linux-next-d2cac287140d890b72b3a82a643b25465ba60f9a.tar.gz linux-next-d2cac287140d890b72b3a82a643b25465ba60f9a.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
# Conflicts:
# arch/s390/mm/init.c
Diffstat (limited to 'kernel')
| -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 { /* |