From patchwork Thu Oct 29 17:02:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 56496 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9TH2t5U032374 for ; Thu, 29 Oct 2009 17:02:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756041AbZJ2RCr (ORCPT ); Thu, 29 Oct 2009 13:02:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756037AbZJ2RCr (ORCPT ); Thu, 29 Oct 2009 13:02:47 -0400 Received: from goliath.siemens.de ([192.35.17.28]:22309 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756014AbZJ2RCr (ORCPT ); Thu, 29 Oct 2009 13:02:47 -0400 Received: from mail2.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9TH2cHd029813; Thu, 29 Oct 2009 18:02:38 +0100 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9TH2aBO027709; Thu, 29 Oct 2009 18:02:37 +0100 Message-ID: <4AE9CAAC.3070905@siemens.com> Date: Thu, 29 Oct 2009 18:02:36 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] KVM: VMX: Build move_msr_up also for x86-32 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6b818c0..3ebb022 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -885,7 +885,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; @@ -894,7 +893,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