1.1 --- a/xen/common/memory.c	Wed Mar 28 13:52:03 2007 +0100
     1.2 +++ b/xen/common/memory.c	Wed Mar 28 13:53:27 2007 +0100
     1.3 @@ -173,11 +173,11 @@ int guest_remove_page(struct domain *d, 
     1.4      if ( test_and_clear_bit(_PGC_allocated, &page->count_info) )
     1.5          put_page(page);
     1.6  
     1.7 -    if ( unlikely(!page_is_removable(page)) )
     1.8 +    if ( unlikely((page->count_info & PGC_count_mask) != 1) )
     1.9      {
    1.10          shadow_drop_references(d, page);
    1.11          /* We'll make this a guest-visible error in future, so take heed! */
    1.12 -        if ( !page_is_removable(page) )
    1.13 +        if ( (page->count_info & PGC_count_mask) != 1 )
    1.14              gdprintk(XENLOG_INFO, "Dom%d freeing in-use page %lx "
    1.15                       "(pseudophys %lx): count=%lx type=%lx\n",
    1.16                       d->domain_id, mfn, get_gpfn_from_mfn(mfn),

     2.1 --- a/xen/include/asm-ia64/mm.h	Wed Mar 28 13:52:03 2007 +0100
     2.2 +++ b/xen/include/asm-ia64/mm.h	Wed Mar 28 13:53:27 2007 +0100
     2.3 @@ -210,11 +210,6 @@ static inline int get_page_and_type(stru
     2.4      return rc;
     2.5  }
     2.6  
     2.7 -static inline int page_is_removable(struct page_info *page)
     2.8 -{
     2.9 -    return ((page->count_info & PGC_count_mask) == 1);
    2.10 -}
    2.11 -
    2.12  #define	set_machinetophys(_mfn, _pfn) do { } while(0);
    2.13  
    2.14  #ifdef MEMORY_GUARD

     3.1 --- a/xen/include/asm-powerpc/mm.h	Wed Mar 28 13:52:03 2007 +0100
     3.2 +++ b/xen/include/asm-powerpc/mm.h	Wed Mar 28 13:53:27 2007 +0100
     3.3 @@ -204,11 +204,6 @@ static inline int get_page_and_type(stru
     3.4      return rc;
     3.5  }
     3.6  
     3.7 -static inline int page_is_removable(struct page_info *page)
     3.8 -{
     3.9 -    return ((page->count_info & PGC_count_mask) == 1);
    3.10 -}
    3.11 -
    3.12  extern void synchronise_pagetables(unsigned long cpu_mask);
    3.13  
    3.14  /* XXX don't know what this is for */

     4.1 --- a/xen/include/asm-x86/mm.h	Wed Mar 28 13:52:03 2007 +0100
     4.2 +++ b/xen/include/asm-x86/mm.h	Wed Mar 28 13:53:27 2007 +0100
     4.3 @@ -222,11 +222,6 @@ static inline int get_page_and_type(stru
     4.4      return rc;
     4.5  }
     4.6  
     4.7 -static inline int page_is_removable(struct page_info *page)
     4.8 -{
     4.9 -    return ((page->count_info & PGC_count_mask) == 1);
    4.10 -}
    4.11 -
    4.12  #define ASSERT_PAGE_IS_TYPE(_p, _t)                            \
    4.13      ASSERT(((_p)->u.inuse.type_info & PGT_type_mask) == (_t)); \
    4.14      ASSERT(((_p)->u.inuse.type_info & PGT_count_mask) != 0)