From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony Liguori Subject: [PATCH] Fix CONFIG_X86_64 guard Date: Fri, 20 Apr 2007 17:11:25 -0500 Message-ID: <46293A8D.8010801@us.ibm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040204020307060207000908" To: kvm-devel , Avi Kivity Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org This is a multi-part message in MIME format. --------------040204020307060207000908 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Using #if results in a GCC warning when CONFIG_X86_64 is not defined. Attached patch switches to #ifdef which behaves appropriately. This is against the master branch of Avi's kernel tree. Regards, Anthony Liguori Signed-off-by: Anthony Liguori --------------040204020307060207000908 Content-Type: text/x-patch; name="kvm-config.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="kvm-config.diff" diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 8baf0c9..28af5b0 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -328,7 +328,7 @@ static void setup_msrs(struct kvm_vcpu *vcpu) * if efer.sce is enabled. */ --nr_good_msrs; -#if CONFIG_X86_64 +#ifdef CONFIG_X86_64 if (is_long_mode(vcpu) && (vcpu->shadow_efer & EFER_SCE)) ++nr_good_msrs; #endif --------------040204020307060207000908 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ --------------040204020307060207000908 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/kvm-devel --------------040204020307060207000908--