Merge tag 'timers-urgent-2026-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Ingo Molnar:

- Fix auxiliary timekeeper update & locking bug

- Reduce the sensitivity of the clocksource watchdog,
to fix false positive measurements that marked the
TSC clocksource unstable

* tag 'timers-urgent-2026-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Reduce watchdog readout delay limit to prevent false positives
timekeeping: Adjust the leap state for the correct auxiliary timekeeper

+2 -2
+1 -1
kernel/time/clocksource.c
··· 252 253 static enum wd_read_status cs_watchdog_read(struct clocksource *cs, u64 *csnow, u64 *wdnow) 254 { 255 - int64_t md = 2 * watchdog->uncertainty_margin; 256 unsigned int nretries, max_retries; 257 int64_t wd_delay, wd_seq_delay; 258 u64 wd_end, wd_end2;
··· 252 253 static enum wd_read_status cs_watchdog_read(struct clocksource *cs, u64 *csnow, u64 *wdnow) 254 { 255 + int64_t md = watchdog->uncertainty_margin; 256 unsigned int nretries, max_retries; 257 int64_t wd_delay, wd_seq_delay; 258 u64 wd_end, wd_end2;
+1 -1
kernel/time/timekeeping.c
··· 2735 timekeeping_update_from_shadow(tkd, TK_CLOCK_WAS_SET); 2736 result->clock_set = true; 2737 } else { 2738 - tk_update_leap_state_all(&tk_core); 2739 } 2740 2741 /* Update the multiplier immediately if frequency was set directly */
··· 2735 timekeeping_update_from_shadow(tkd, TK_CLOCK_WAS_SET); 2736 result->clock_set = true; 2737 } else { 2738 + tk_update_leap_state_all(tkd); 2739 } 2740 2741 /* Update the multiplier immediately if frequency was set directly */