From 190abd0da3078b90786d9c2fd146066db2f42d04 Mon Sep 17 00:00:00 2001 From: Gabriel C Date: Wed, 1 Aug 2007 16:23:10 +0200 Subject: [PATCH] --- yaml --- r: 68382 b: refs/heads/master c: 54e11fa1f87771df0fc1bb42a75be0740c3babb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/vmx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ee0312169381..661645e6a817 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37c00051b53861929a910309c1823b415d55cfdf +refs/heads/master: 54e11fa1f87771df0fc1bb42a75be0740c3babb9 diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index a94eb205cecd..3bf36508c84b 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -544,6 +544,7 @@ static void vmx_inject_gp(struct kvm_vcpu *vcpu, unsigned error_code) /* * 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 kvm_msr_entry tmp; @@ -555,6 +556,7 @@ static void move_msr_up(struct vcpu_vmx *vmx, int from, int to) vmx->host_msrs[to] = vmx->host_msrs[from]; vmx->host_msrs[from] = tmp; } +#endif /* * Set up the vmcs to automatically save and restore system