From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH v3 09/10] xen: gate split heap code on its own config option rather than !X86 Date: Thu, 8 Aug 2013 13:15:16 +0100 Message-ID: <1375964117-23120-9-git-send-email-ian.campbell@citrix.com> References: <1375964079.970.94.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1375964079.970.94.camel@kazak.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: xen-devel@lists.xen.org Cc: julien.grall@citrix.com, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org I'm going to want to disable this for 64 bit ARM. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Stefano Stabellini Acked-by: Keir Fraser --- xen/common/page_alloc.c | 2 +- xen/include/asm-arm/config.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 25a7d3d..41251b2 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1305,7 +1305,7 @@ void __init scrub_heap_pages(void) * XEN-HEAP SUB-ALLOCATOR */ -#if !defined(CONFIG_X86) +#if defined(CONFIG_SEPARATE_XENHEAP) void init_xenheap_pages(paddr_t ps, paddr_t pe) { diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 7e5daa0..fb9e93c 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -36,6 +36,7 @@ #define CONFIG_SMP 1 #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_SEPARATE_XENHEAP 1 #define CONFIG_VIDEO 1 -- 1.7.2.5