[Xen-changelog] [xen-unstable] Remove page_is_removable arch hook. Now the ia64 p2m semantic becomes

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1175086407 -3600
# Node ID 72a5f76ac8dda9e1df38562b51a3da73f10266d9
# Parent  77b210daefee957faa220e94501ace6bf50e3b97
Remove page_is_removable arch hook. Now the ia64 p2m semantic becomes
same as the x86 p2m table so that the hook is unnecessary any more.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/common/memory.c          |    4 ++--
 xen/include/asm-ia64/mm.h    |    5 -----
 xen/include/asm-powerpc/mm.h |    5 -----
 xen/include/asm-x86/mm.h     |    5 -----
 4 files changed, 2 insertions(+), 17 deletions(-)

diff -r 77b210daefee -r 72a5f76ac8dd xen/common/memory.c
--- a/xen/common/memory.c       Wed Mar 28 13:52:03 2007 +0100
+++ b/xen/common/memory.c       Wed Mar 28 13:53:27 2007 +0100
@@ -173,11 +173,11 @@ int guest_remove_page(struct domain *d, 
     if ( test_and_clear_bit(_PGC_allocated, &page->count_info) )
         put_page(page);
 
-    if ( unlikely(!page_is_removable(page)) )
+    if ( unlikely((page->count_info & PGC_count_mask) != 1) )
     {
         shadow_drop_references(d, page);
         /* We'll make this a guest-visible error in future, so take heed! */
-        if ( !page_is_removable(page) )
+        if ( (page->count_info & PGC_count_mask) != 1 )
             gdprintk(XENLOG_INFO, "Dom%d freeing in-use page %lx "
                      "(pseudophys %lx): count=%lx type=%lx\n",
                      d->domain_id, mfn, get_gpfn_from_mfn(mfn),
diff -r 77b210daefee -r 72a5f76ac8dd xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Wed Mar 28 13:52:03 2007 +0100
+++ b/xen/include/asm-ia64/mm.h Wed Mar 28 13:53:27 2007 +0100
@@ -208,11 +208,6 @@ static inline int get_page_and_type(stru
     }
 
     return rc;
-}
-
-static inline int page_is_removable(struct page_info *page)
-{
-    return ((page->count_info & PGC_count_mask) == 1);
 }
 
 #define        set_machinetophys(_mfn, _pfn) do { } while(0);
diff -r 77b210daefee -r 72a5f76ac8dd xen/include/asm-powerpc/mm.h
--- a/xen/include/asm-powerpc/mm.h      Wed Mar 28 13:52:03 2007 +0100
+++ b/xen/include/asm-powerpc/mm.h      Wed Mar 28 13:53:27 2007 +0100
@@ -204,11 +204,6 @@ static inline int get_page_and_type(stru
     return rc;
 }
 
-static inline int page_is_removable(struct page_info *page)
-{
-    return ((page->count_info & PGC_count_mask) == 1);
-}
-
 extern void synchronise_pagetables(unsigned long cpu_mask);
 
 /* XXX don't know what this is for */
diff -r 77b210daefee -r 72a5f76ac8dd xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  Wed Mar 28 13:52:03 2007 +0100
+++ b/xen/include/asm-x86/mm.h  Wed Mar 28 13:53:27 2007 +0100
@@ -222,11 +222,6 @@ static inline int get_page_and_type(stru
     return rc;
 }
 
-static inline int page_is_removable(struct page_info *page)
-{
-    return ((page->count_info & PGC_count_mask) == 1);
-}
-
 #define ASSERT_PAGE_IS_TYPE(_p, _t)                            \
     ASSERT(((_p)->u.inuse.type_info & PGT_type_mask) == (_t)); \
     ASSERT(((_p)->u.inuse.type_info & PGT_count_mask) != 0)

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