From: Michael Riepe <michael@mr511.de>
Date: Wed, 13 Dec 2006 08:34:15 +0000 (-0800)
Subject: [PATCH] KVM: Don't touch the virtual apic vt registers on 32-bit
X-Git-Tag: v2.6.20-rc1~111
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b99ab242145c99ec8781dc267ec100e7f23ef9d;p=karo-tx-linux.git

[PATCH] KVM: Don't touch the virtual apic vt registers on 32-bit

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index d046296a9304..ea3bdbb0da9c 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1175,8 +1175,10 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
                                VM_ENTRY_CONTROLS, 0);
 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);  /* 22.2.1 */
 
+#ifdef CONFIG_X86_64
 	vmcs_writel(VIRTUAL_APIC_PAGE_ADDR, 0);
 	vmcs_writel(TPR_THRESHOLD, 0);
+#endif
 
 	vmcs_writel(CR0_GUEST_HOST_MASK, KVM_GUEST_CR0_MASK);
 	vmcs_writel(CR4_GUEST_HOST_MASK, KVM_GUEST_CR4_MASK);