1.1 --- a/xen/arch/x86/mm.c	Mon Jan 26 16:52:38 2009 +0000
     1.2 +++ b/xen/arch/x86/mm.c	Mon Jan 26 23:35:47 2009 +0000
     1.3 @@ -330,7 +330,11 @@ void share_xen_page_with_guest(
     1.4  
     1.5      page_set_owner(page, d);
     1.6      wmb(); /* install valid domain ptr before updating refcnt. */
     1.7 -    ASSERT((page->count_info & (PGC_allocated|PGC_count_mask)) == 0);
     1.8 +#ifdef __i386__
     1.9 +    ASSERT(page->count_info == 0);
    1.10 +#else
    1.11 +    ASSERT((page->count_info & ~PGC_xen_heap) == 0);
    1.12 +#endif
    1.13  
    1.14      /* Only add to the allocation list if the domain isn't dying. */
    1.15      if ( !d->is_dying )
    1.16 @@ -1946,7 +1950,8 @@ int get_page(struct page_info *page, str
    1.17   fail:
    1.18      if ( !_shadow_mode_refcounts(domain) && !domain->is_dying )
    1.19          gdprintk(XENLOG_INFO,
    1.20 -                 "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info,
    1.21 +                 "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%"
    1.22 +                 PRtype_info "\n",
    1.23                   page_to_mfn(page), domain, page_get_owner(page),
    1.24                   y, page->u.inuse.type_info);
    1.25      return 0;