[Xen-changelog] [xen-unstable] [IA64] remove opt_p2m_xenheap

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1233281367 -32400
# Node ID 4773f40d14f2d75a850fc12e06d2642c09567ddd
# Parent  7029eb0930b4d6fa3578a58a43f2a5874c2888c8
[IA64] remove opt_p2m_xenheap

xenheap isn't pinned down now so that allocating p2m pages from
xenheap doesn't make sense anymore.
This is preparation for removing xenheap.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/xen/mm.c |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff -r 7029eb0930b4 -r 4773f40d14f2 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c    Fri Jan 30 11:04:51 2009 +0900
+++ b/xen/arch/ia64/xen/mm.c    Fri Jan 30 11:09:27 2009 +0900
@@ -3060,31 +3060,18 @@ static int alloc_page_type(struct page_i
        return 1;
 }
 
-static int opt_p2m_xenheap;
-boolean_param("p2m_xenheap", opt_p2m_xenheap);
-
 void *pgtable_quicklist_alloc(void)
 {
+    struct page_info *page;
     void *p;
 
     BUG_ON(dom_p2m == NULL);
-    if (!opt_p2m_xenheap) {
-        struct page_info *page = alloc_domheap_page(dom_p2m, 0);
-        if (page == NULL)
-            return NULL;
-        p = page_to_virt(page);
-        clear_page(p);
-        return p;
-    }
-    p = alloc_xenheap_page();
-    if (p) {
-        clear_page(p);
-        /*
-         * This page should be read only.  At this moment, the third
-         * argument doesn't make sense.  It should be 1 when supported.
-         */
-        share_xen_page_with_guest(virt_to_page(p), dom_p2m, 0);
-    }
+    page = alloc_domheap_page(dom_p2m, 0);
+    if (page == NULL)
+        return NULL;
+
+    p = page_to_virt(page);
+    clear_page(p);
     return p;
 }
 
@@ -3096,8 +3083,6 @@ void pgtable_quicklist_free(void *pgtabl
     BUG_ON(page->count_info != (1 | PGC_allocated));
 
     put_page(page);
-    if (opt_p2m_xenheap)
-        free_xenheap_page(pgtable_entry);
 }
 
 void put_page_type(struct page_info *page)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog