aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/pvclock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
index 1c54b5fb7aed..4f9c55f3a7c0 100644
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
@@ -99,14 +99,14 @@ static unsigned pvclock_get_time_values(struct pvclock_shadow_time *dst,
99 99
100unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) 100unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
101{ 101{
102 u64 tsc_khz = 1000000ULL << 32; 102 u64 pv_tsc_khz = 1000000ULL << 32;
103 103
104 do_div(tsc_khz, src->tsc_to_system_mul); 104 do_div(pv_tsc_khz, src->tsc_to_system_mul);
105 if (src->tsc_shift < 0) 105 if (src->tsc_shift < 0)
106 tsc_khz <<= -src->tsc_shift; 106 pv_tsc_khz <<= -src->tsc_shift;
107 else 107 else
108 tsc_khz >>= src->tsc_shift; 108 pv_tsc_khz >>= src->tsc_shift;
109 return tsc_khz; 109 return pv_tsc_khz;
110} 110}
111 111
112cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) 112cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)