From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: julien.grall@citrix.com, tim@xen.org,
Ian Campbell <ian.campbell@citrix.com>,
stefano.stabellini@eu.citrix.com
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 [thread overview]
Message-ID: <1375964117-23120-9-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1375964079.970.94.camel@kazak.uk.xensource.com>
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>
---
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
next prev parent reply other threads:[~2013-08-08 12:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 12:14 [PATCH v3 00/10] xen: arm: direct 1:1 map on 64 bit Ian Campbell
2013-08-08 12:15 ` [PATCH v3 01/10] xen: arm: Use _AC macros in config.h Ian Campbell
2013-08-08 12:15 ` [PATCH v3 02/10] xen: arm: Add zeroeth level page table macros and defines Ian Campbell
2013-08-08 14:01 ` Tim Deegan
2013-08-08 12:15 ` [PATCH v3 03/10] xen: arm: Rename page table "hint" field to slightly more descriptive "contig" Ian Campbell
2013-08-08 12:15 ` [PATCH v3 04/10] xen: arm: refactor create_mappings Ian Campbell
2013-08-08 12:15 ` [PATCH v3 05/10] xen: arm: define a macro to get this CPUs page table root Ian Campbell
2013-08-08 12:15 ` [PATCH v3 06/10] xen: arm: Add a pte_of_xenaddr helper Ian Campbell
2013-08-08 12:15 ` [PATCH v3 07/10] xen: arm: fix is_xen_fixed_mfn Ian Campbell
2013-08-08 12:15 ` [PATCH v3 08/10] xen: arm: allow virt_to_maddr to take either a pointer or an integer Ian Campbell
2013-08-08 12:15 ` Ian Campbell [this message]
2013-08-08 12:15 ` [PATCH v3 10/10] xen: arm: Use a direct mapping of RAM on arm64 Ian Campbell
2013-08-20 15:02 ` [PATCH v3 00/10] xen: arm: direct 1:1 map on 64 bit Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375964117-23120-9-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=julien.grall@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).