tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'timers_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Borislav Petkov:

- Make sure the CLOCK_REALTIME to CLOCK_MONOTONIC offset is never
positive

* tag 'timers_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Really make sure wall_to_monotonic isn't positive

Linus Torvalds e1fe1b10 909e1d16

+1 -2
+1 -2
kernel/time/timekeeping.c
··· 1306 1306 timekeeping_forward_now(tk); 1307 1307 1308 1308 xt = tk_xtime(tk); 1309 - ts_delta.tv_sec = ts->tv_sec - xt.tv_sec; 1310 - ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec; 1309 + ts_delta = timespec64_sub(*ts, xt); 1311 1310 1312 1311 if (timespec64_compare(&tk->wall_to_monotonic, &ts_delta) > 0) { 1313 1312 ret = -EINVAL;