diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 07:58:33 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 07:58:33 +0200 |
| commit | ff1c0c5d07028a84837950b619d30da623f8ddb2 (patch) | |
| tree | 0dac4e0728613580a935876b3b5ba7ba29f51865 /kernel/time/hrtimer.c | |
| parent | 09c04714cb455debc1dcc3535b6becb52c5b01e0 (diff) | |
| parent | d6e152d905bdb1f32f9d99775e2f453350399a6a (diff) | |
Merge branch 'timers/urgent' into timers/core
to resolve the conflict with urgent fixes.
Diffstat (limited to 'kernel/time/hrtimer.c')
| -rw-r--r-- | kernel/time/hrtimer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 000fb6ba7d74..5bd6efe598f0 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -2090,6 +2090,7 @@ void hrtimer_interrupt(struct clock_event_device *dev) BUG_ON(!cpu_base->hres_active); cpu_base->nr_events++; dev->next_event = KTIME_MAX; + dev->next_event_forced = 0; raw_spin_lock_irqsave(&cpu_base->lock, flags); entry_time = now = hrtimer_update_base(cpu_base); |