diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 00:01:13 +0200 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2020-05-23 00:01:13 +0200 |
| commit | 1f422417945d08731e2915e0addb976f11b3a85a (patch) | |
| tree | 7ef06daa2a34c3b527e3eb7a064bc4af0c9100c0 /drivers/clocksource/hyperv_timer.c | |
| parent | c177e2975430cec296aa52a0d413e447417d6cf9 (diff) | |
| parent | 6d15120b282e49811a47f2f6d6b749d178be7e99 (diff) | |
Merge branch 'timers/drivers/timer-ti' into timers/drivers/next
Diffstat (limited to 'drivers/clocksource/hyperv_timer.c')
| -rw-r--r-- | drivers/clocksource/hyperv_timer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c index a86859ccc61b..09aa44cb8a91 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -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) @@ -405,7 +406,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 = { |