Commit 12a00948 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents af5a3fae c06343be

kernel/time/clocksource.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ enum wd_read_status { 


static enum wd_read_status cs_watchdog_read(struct clocksource *cs, u64 *csnow, u64 *wdnow)

{

	int64_t md = 2 * watchdog->uncertainty_margin;

	int64_t md = watchdog->uncertainty_margin;

	unsigned int nretries, max_retries;

	int64_t wd_delay, wd_seq_delay;

	u64 wd_end, wd_end2;

kernel/time/timekeeping.c

+1 −1
Original line number Diff line number Diff line
@@ -2735,7 +2735,7 @@ static int __do_adjtimex(struct tk_data *tkd, struct __kernel_timex *txc, 
		timekeeping_update_from_shadow(tkd, TK_CLOCK_WAS_SET);

		result->clock_set = true;

	} else {

		tk_update_leap_state_all(&tk_core);

		tk_update_leap_state_all(tkd);

	}



	/* Update the multiplier immediately if frequency was set directly */