[XFS] Fix merge failures

[pandora-kernel.git] / arch / x86 / kernel / pvclock.c

diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
index 1c54b5f..4f9c55f 100644 (file)
--- 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,
 
 unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
 {
-       u64 tsc_khz = 1000000ULL << 32;
+       u64 pv_tsc_khz = 1000000ULL << 32;
 
-       do_div(tsc_khz, src->tsc_to_system_mul);
+       do_div(pv_tsc_khz, src->tsc_to_system_mul);
        if (src->tsc_shift < 0)
-               tsc_khz <<= -src->tsc_shift;
+               pv_tsc_khz <<= -src->tsc_shift;
        else
-               tsc_khz >>= src->tsc_shift;
-       return tsc_khz;
+               pv_tsc_khz >>= src->tsc_shift;
+       return pv_tsc_khz;
 }
 
 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)