From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 8 Aug 2013 12:15:16 +0000 (+0100)
Subject: xen: gate split heap code on its own config option rather than !X86
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6494
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2c092bb6ee902997363b338cde447fe11b3a75c6;p=xen.git

xen: gate split heap code on its own config option rather than !X86

I'm going to want to disable this for 64 bit ARM.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 25a7d3daaf..41251b2c0c 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 7e5daa00bd..fb9e93cc4d 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