From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 01/14] Build fixes which I beleive others have already fixed properly elsewhere Date: Thu, 4 Oct 2012 16:11:42 +0100 Message-ID: <1349363515-26190-1-git-send-email-ian.campbell@citrix.com> References: <1349363496.866.49.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1349363496.866.49.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Konrad Rzeszutek Wilk , Stefano Stabellini , Mukesh Rathor Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Do not apply, you have better versions of all these somewhere else! --- drivers/xen/Makefile | 2 +- include/xen/interface/memory.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index cd28aae..275abfc 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -8,10 +8,10 @@ obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) CFLAGS_features.o := $(nostackp) -obj-$(CONFIG_XEN_DOM0) += $(dom0-y) dom0-$(CONFIG_PCI) += pci.o dom0-$(CONFIG_ACPI) += acpi.o dom0-$(CONFIG_X86) += pcpu.o +obj-$(CONFIG_XEN_DOM0) += $(dom0-y) obj-$(CONFIG_BLOCK) += biomerge.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h index 9953914..6d74c47 100644 --- a/include/xen/interface/memory.h +++ b/include/xen/interface/memory.h @@ -163,15 +163,13 @@ struct xen_add_to_physmap { /* Which domain to change the mapping for. */ domid_t domid; - /* Number of pages to go through for gmfn_range */ - uint16_t size; - union { /* Number of pages to go through for gmfn_range */ uint16_t size; /* IFF XENMAPSPACE_gmfn_foreign */ domid_t foreign_domid; } u; + /* Source mapping space. */ #define XENMAPSPACE_shared_info 0 /* shared info page */ #define XENMAPSPACE_grant_table 1 /* grant table page */ -- 1.7.2.5