From: Avi Kivity <avi@redhat.com>
Date: Thu, 29 Oct 2009 11:48:39 +0000 (+0200)
Subject: KVM: VMX: Fix build on i386 due to move_msr_up()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72fb50469960f0877899b5da40d3d0b9e13fa9da;p=users%2Fdwmw2%2Flinux.git

KVM: VMX: Fix build on i386 due to move_msr_up()

Needed for EFER.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 99c34f167f5dc..baa46c7deaa76 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -880,7 +880,6 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
 /*
  * Swap MSR entry in host/guest MSR entry array.
  */
-#ifdef CONFIG_X86_64
 static void move_msr_up(struct vcpu_vmx *vmx, int from, int to)
 {
 	struct shared_msr_entry tmp;
@@ -889,7 +888,6 @@ static void move_msr_up(struct vcpu_vmx *vmx, int from, int to)
 	vmx->guest_msrs[to] = vmx->guest_msrs[from];
 	vmx->guest_msrs[from] = tmp;
 }
-#endif
 
 /*
  * Set up the vmcs to automatically save and restore system