From patchwork Fri Jan 23 20:59:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 3826 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 n0NL09iR019513 for ; Fri, 23 Jan 2009 21:00:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755179AbZAWVAH (ORCPT ); Fri, 23 Jan 2009 16:00:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755183AbZAWVAH (ORCPT ); Fri, 23 Jan 2009 16:00:07 -0500 Received: from mx2.redhat.com ([66.187.237.31]:35006 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755179AbZAWVAF (ORCPT ); Fri, 23 Jan 2009 16:00:05 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n0NL04hs006369 for ; Fri, 23 Jan 2009 16:00:04 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n0NL03GO028171; Fri, 23 Jan 2009 16:00:04 -0500 Received: from blackpad.localdomain (vpn-10-13.bos.redhat.com [10.16.10.13]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n0NL02bW011895; Fri, 23 Jan 2009 16:00:03 -0500 Received: by blackpad.localdomain (Postfix, from userid 500) id 055EF680676; Fri, 23 Jan 2009 18:59:44 -0200 (BRST) From: Eduardo Habkost To: Avi Kivity Cc: kvm@vger.kernel.org, Eduardo Habkost Subject: [maint/2.6.29 PATCH] kvm-userspace: include on external-module-compat.h Date: Fri, 23 Jan 2009 18:59:43 -0200 Message-Id: <1232744383-998-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Make sure we get the MSR_* defines from asm/svm.h before checking if they are defined. This fixes the following warning: In file included from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/kvm_svm.h:10, from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/svm.c:58: /home/ehabkost/code/kvm/kvm-userspace/kernel/include/asm/svm.h:219:1: warning: "MSR_VM_HSAVE_PA" redefined This fix applies only to the maint/2.6.29 branch, as on the master branch the MSR_* defines went to a different header file. Signed-off-by: Eduardo Habkost --- kernel/x86/external-module-compat.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/kernel/x86/external-module-compat.h b/kernel/x86/external-module-compat.h index 04352bc..9ba1cc8 100644 --- a/kernel/x86/external-module-compat.h +++ b/kernel/x86/external-module-compat.h @@ -10,6 +10,9 @@ #include +/* for the MSR_VM_* constants that were moved to svm.h */ +#include + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) #ifndef _EFER_SCE