diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-08-03 17:07:51 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-08-05 16:14:14 +0200 |
| commit | 5916be8a53de6401871bdd953f6c60237b47d6d3 (patch) | |
| tree | 58fbb1542f4c4b2fabfc3fd8e2e672eab7c4a0c1 | |
| parent | 06c03c8edce333b9ad9c6b207d93d3a5ae7c10c0 (diff) | |
| download | linux-stable-5916be8a53de6401871bdd953f6c60237b47d6d3.tar.gz linux-stable-5916be8a53de6401871bdd953f6c60237b47d6d3.tar.bz2 linux-stable-5916be8a53de6401871bdd953f6c60237b47d6d3.zip | |
timekeeping: Fix bogus clock_was_set() invocation in do_adjtimex()
The addition of the bases argument to clock_was_set() fixed up all call
sites correctly except for do_adjtimex(). This uses CLOCK_REALTIME
instead of CLOCK_SET_WALL as argument. CLOCK_REALTIME is 0.
As a result the effect of that clock_was_set() notification is incomplete
and might result in timers expiring late because the hrtimer code does
not re-evaluate the affected clock bases.
Use CLOCK_SET_WALL instead of CLOCK_REALTIME to tell the hrtimers code
which clock bases need to be re-evaluated.
Fixes: 17a1b8826b45 ("hrtimer: Add bases argument to clock_was_set()")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/877ccx7igo.ffs@tglx
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 2fa87dcfeda9..5391e4167d60 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -2606,7 +2606,7 @@ int do_adjtimex(struct __kernel_timex *txc) clock_set |= timekeeping_advance(TK_ADV_FREQ); if (clock_set) - clock_was_set(CLOCK_REALTIME); + clock_was_set(CLOCK_SET_WALL); ntp_notify_cmos_timer(); |