From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 10/12] arm: stub out PoD
Date: Fri, 20 Jan 2012 12:06:36 +0000 [thread overview]
Message-ID: <1327061198-29854-10-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1327061025.30054.21.camel@zakaz.uk.xensource.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/dummy.S | 2 --
xen/include/asm-arm/mm.h | 8 ++++++--
xen/include/asm-arm/p2m.h | 11 +++++++----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S
index e858613..67edb35 100644
--- a/xen/arch/arm/dummy.S
+++ b/xen/arch/arm/dummy.S
@@ -31,8 +31,6 @@ DUMMY(is_iomem_page);
DUMMY(max_page);
DUMMY(node_online_map);
DUMMY(nr_irqs_gsi);
-DUMMY(p2m_pod_decrease_reservation);
-DUMMY(guest_physmap_mark_populate_on_demand);
DUMMY(page_get_owner_and_reference);
DUMMY(page_is_ram_type);
DUMMY(per_cpu__cpu_core_mask);
diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h
index f721c54..ebe09cf 100644
--- a/xen/include/asm-arm/mm.h
+++ b/xen/include/asm-arm/mm.h
@@ -294,8 +294,12 @@ extern struct domain *dom_xen, *dom_io, *dom_cow;
#define memguard_guard_stack(_p) ((void)0)
#define memguard_guard_range(_p,_l) ((void)0)
#define memguard_unguard_range(_p,_l) ((void)0)
-int guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn,
- unsigned int order);
+/*
+ * int guest_physmap_mark_populate_on_demand(struct domain *d,
+ * unsigned long gfn,
+ * unsigned int order)
+ */
+#define guest_physmap_mark_populate_on_demand(d, gfn, order) -ENOSYS /* No PoD on ARM */
extern void put_page_type(struct page_info *page);
static inline void put_page_and_type(struct page_info *page)
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index aec52f7..723518d 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -48,10 +48,13 @@ unsigned long gmfn_to_mfn(struct domain *d, unsigned long gpfn);
/* Call when decreasing memory reservation to handle PoD entries properly.
* Will return '1' if all entries were handled and nothing more need be done.*/
-int
-p2m_pod_decrease_reservation(struct domain *d,
- xen_pfn_t gpfn,
- unsigned int order);
+ /* No PoD on ARM yet */
+/* int
+ * p2m_pod_decrease_reservation(struct domain *d,
+ * xen_pfn_t gpfn,
+ * unsigned int order);
+ */
+#define p2m_pod_decrease_reservation(d, gpfn, order) -ENOSYS
/* Compatibility function exporting the old untyped interface */
static inline unsigned long get_gfn_untyped(struct domain *d, unsigned long gpfn)
--
1.7.2.5
next prev parent reply other threads:[~2012-01-20 12:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 12:03 [PATCH 00/12] ARM: Slim down dummy.S Ian Campbell
2012-01-20 12:06 ` [PATCH 01/12] arm: add a missing local-vars comment Ian Campbell
2012-01-20 12:06 ` [PATCH 02/12] arm: define some more cp15 registers Ian Campbell
2012-01-20 12:06 ` [PATCH 03/12] arm: align some register bit definitions Ian Campbell
2012-01-20 12:06 ` [PATCH 04/12] arm: remove some unnecessary symbols from dummy.S Ian Campbell
2012-01-20 12:06 ` [PATCH 05/12] arm: Add stub functions instead of using DUMMY Ian Campbell
2012-01-20 12:06 ` [PATCH 06/12] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI Ian Campbell
2012-01-20 12:06 ` [PATCH 07/12] xen: allow tmem to be disabled on platforms which do not support it (ARM) Ian Campbell
2012-01-20 12:19 ` Stefano Stabellini
2012-01-20 12:25 ` Tim Deegan
2012-01-20 12:34 ` Jan Beulich
2012-01-20 22:24 ` Dan M @ Oracle
2012-01-20 12:28 ` Ian Campbell
2012-01-20 12:36 ` Jan Beulich
2012-01-20 12:39 ` Ian Campbell
2012-01-20 12:51 ` Jan Beulich
2012-01-20 12:06 ` [PATCH 08/12] arm: Implement arch_get_xen_caps Ian Campbell
2012-01-20 12:06 ` [PATCH 09/12] xen: only map PV guest grants via iommu if HAS_PASSTHROUGH Ian Campbell
2012-01-20 12:38 ` Jan Beulich
2012-01-20 12:40 ` Ian Campbell
2012-01-20 12:52 ` Jan Beulich
2012-01-20 12:06 ` Ian Campbell [this message]
2012-01-20 12:20 ` [PATCH 10/12] arm: stub out PoD Stefano Stabellini
2012-01-20 12:29 ` Ian Campbell
2012-01-20 12:35 ` Tim Deegan
2012-01-20 12:40 ` Ian Campbell
2012-01-20 12:06 ` [PATCH 11/12] arm: define max_page Ian Campbell
2012-01-20 12:06 ` [PATCH 12/12] arm: Group remaining dummy symbols somewhat according to functionality Ian Campbell
2012-01-20 12:20 ` [PATCH 00/12] ARM: Slim down dummy.S Stefano Stabellini
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=1327061198-29854-10-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=xen-devel@lists.xensource.com \
/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).