Merge branch 'master' into queue

[sfrench/cifs-2.6.git] / arch / x86 / kernel / kvmclock.c

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index b730efad6fe98adf39b5d87ff8e873dfa823b50a..d2c381280e3cfd1a3b462ab0d43320f424e1e7bc 100644 (file)
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -166,8 +166,8 @@ int kvm_register_clock(char *txt)
                return 0;
 
        src = &hv_clock[cpu].pvti;
-       low = (int)__pa(src) | 1;
-       high = ((u64)__pa(src) >> 32);
+       low = (int)slow_virt_to_phys(src) | 1;
+       high = ((u64)slow_virt_to_phys(src) >> 32);
        ret = native_write_msr_safe(msr_kvm_system_time, low, high);
        printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n",
               cpu, high, low, txt);