Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"A single fix for a thinko in the raw timekeeper update which causes
clock MONOTONIC_RAW to run with erratically increased frequency"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Fix ktime_get_raw() incorrect base accumulation
+1
-3
+1
-3
kernel/time/timekeeping.c
+1
-3
kernel/time/timekeeping.c
···
637
637
tk->ktime_sec = seconds;
638
638
639
639
/* Update the monotonic raw base */
640
-
seconds = tk->raw_sec;
641
-
nsec = (u32)(tk->tkr_raw.xtime_nsec >> tk->tkr_raw.shift);
642
-
tk->tkr_raw.base = ns_to_ktime(seconds * NSEC_PER_SEC + nsec);
640
+
tk->tkr_raw.base = ns_to_ktime(tk->raw_sec * NSEC_PER_SEC);
643
641
}
644
642
645
643
/* must hold timekeeper_lock */