From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 14 Jul 2016 17:08:18 +0000 (+0200)
Subject: KVM: SVM: do not set MSR_TSC_AUX on 32-bit builds
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2b23c3a6e3eb;p=deliverable%2Flinux.git

KVM: SVM: do not set MSR_TSC_AUX on 32-bit builds

This is unnecessary---and besides, __getcpu() is not even
available on 32-bit builds.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index f931d3e33c7f..05c08b69cee7 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -4550,9 +4550,9 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
 #endif
 		);
 
+#ifdef CONFIG_X86_64
 	if (static_cpu_has(X86_FEATURE_RDTSCP))
 		wrmsrl(MSR_TSC_AUX, __getcpu());
-#ifdef CONFIG_X86_64
 	wrmsrl(MSR_GS_BASE, svm->host.gs_base);
 #else
 	loadsegment(fs, svm->host.fs);