commit 3b99ab242145c99ec8781dc267ec100e7f23ef9d
author Michael Riepe <michael@mr511.de> Wed Dec 13 00:34:15 2006 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> Wed Dec 13 09:05:48 2006 -0800
tree b382de90fcd739843807a22c933f1efd798f4ac8
parent 873a7c423bf8f12bff48a4b8963b32be568b4fcf

[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>

drivers/kvm/vmx.c

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index d046296..ea3bdbb 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1175,8 +1175,10 @@
                                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);