Re: [PATCH v2 09/10] xen: gate split heap code on its own config option rather than !X86

[Keir Fraser <keir.xen@gmail.com>]

On 07/08/2013 14:31, "Ian Campbell" <ian.campbell@citrix.com> wrote:

> 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>
> Cc: keir@xen.org

Acked-by: Keir Fraser <keir@xen.org>

> ---
>  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
>