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

Merge tag 'timers-urgent-2020-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
"A single fix for the Hyper-V clocksource driver to make sched clock
actually return nanoseconds and not the virtual clock value which
increments at 10e7 HZ (100ns)"

* tag 'timers-urgent-2020-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/hyper-v: Make sched clock return nanoseconds correctly

Linus Torvalds ab93e984 01af08bd

options
unified split
Changed files
+4 -2
drivers
clocksource
hyperv_timer.c
+4 -2
drivers/clocksource/hyperv_timer.c
··· 343 343 344 344 static u64 read_hv_sched_clock_tsc(void) 345 345 { 346 - return read_hv_clock_tsc() - hv_sched_clock_offset; 346 + return (read_hv_clock_tsc() - hv_sched_clock_offset) * 347 + (NSEC_PER_SEC / HV_CLOCK_HZ); 347 348 } 348 349 349 350 static void suspend_hv_clock_tsc(struct clocksource *arg) ··· 399 398 400 399 static u64 read_hv_sched_clock_msr(void) 401 400 { 402 - return read_hv_clock_msr() - hv_sched_clock_offset; 401 + return (read_hv_clock_msr() - hv_sched_clock_offset) * 402 + (NSEC_PER_SEC / HV_CLOCK_HZ); 403 403 } 404 404 405 405 static struct clocksource hyperv_cs_msr = {