Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / x86 / kvm / svm.c

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index f7f6a4a157a6f8cc8cbeec4e92d718f5c275c86d..65510f624dfe2a42571bc22e73d8755a23e801e5 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -670,7 +670,7 @@ static int svm_hardware_enable(void)
 
        if (static_cpu_has(X86_FEATURE_TSCRATEMSR)) {
                wrmsrl(MSR_AMD64_TSC_RATIO, TSC_RATIO_DEFAULT);
-               __get_cpu_var(current_tsc_ratio) = TSC_RATIO_DEFAULT;
+               __this_cpu_write(current_tsc_ratio, TSC_RATIO_DEFAULT);
        }
 
 
@@ -1313,8 +1313,8 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
                rdmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]);
 
        if (static_cpu_has(X86_FEATURE_TSCRATEMSR) &&
-           svm->tsc_ratio != __get_cpu_var(current_tsc_ratio)) {
-               __get_cpu_var(current_tsc_ratio) = svm->tsc_ratio;
+           svm->tsc_ratio != __this_cpu_read(current_tsc_ratio)) {
+               __this_cpu_write(current_tsc_ratio, svm->tsc_ratio);
                wrmsrl(MSR_AMD64_TSC_RATIO, svm->tsc_ratio);
        }
 }