Skip to content

Commit 12a0094

Browse files
committed
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 parents af5a3fa + c06343b commit 12a0094

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/time/clocksource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ enum wd_read_status {
252252

253253
static enum wd_read_status cs_watchdog_read(struct clocksource *cs, u64 *csnow, u64 *wdnow)
254254
{
255-
int64_t md = 2 * watchdog->uncertainty_margin;
255+
int64_t md = watchdog->uncertainty_margin;
256256
unsigned int nretries, max_retries;
257257
int64_t wd_delay, wd_seq_delay;
258258
u64 wd_end, wd_end2;

kernel/time/timekeeping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2735,7 +2735,7 @@ static int __do_adjtimex(struct tk_data *tkd, struct __kernel_timex *txc,
27352735
timekeeping_update_from_shadow(tkd, TK_CLOCK_WAS_SET);
27362736
result->clock_set = true;
27372737
} else {
2738-
tk_update_leap_state_all(&tk_core);
2738+
tk_update_leap_state_all(tkd);
27392739
}
27402740

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

0 commit comments

Comments
 (0)