Merge tag 'timers-urgent-2020-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (ab93e984) · Commits · 戴 / test

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

drivers/clocksource/hyperv_timer.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -343,7 +343,8 @@ static u64 notrace read_hv_clock_tsc_cs(struct clocksource *arg)

		static u64 read_hv_sched_clock_tsc(void)
		{
		return read_hv_clock_tsc() - hv_sched_clock_offset;
		return (read_hv_clock_tsc() - hv_sched_clock_offset) *
		(NSEC_PER_SEC / HV_CLOCK_HZ);
		}

		static void suspend_hv_clock_tsc(struct clocksource *arg)
		@@ -398,7 +399,8 @@ static u64 notrace read_hv_clock_msr_cs(struct clocksource *arg)

		static u64 read_hv_sched_clock_msr(void)
		{
		return read_hv_clock_msr() - hv_sched_clock_offset;
		return (read_hv_clock_msr() - hv_sched_clock_offset) *
		(NSEC_PER_SEC / HV_CLOCK_HZ);
		}

		static struct clocksource hyperv_cs_msr = {

Admin message