[Xen-changelog] [xen-unstable] x86: Small improvements to mm.c

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1233012947 0
# Node ID 6b10d97d6fd42cbe7e023135cea8e6a0fdd008aa
# Parent  728d1892f0e24c2531df2d61a2d95177400ceb17
x86: Small improvements to mm.c
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/mm.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff -r 728d1892f0e2 -r 6b10d97d6fd4 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Mon Jan 26 16:52:38 2009 +0000
+++ b/xen/arch/x86/mm.c Mon Jan 26 23:35:47 2009 +0000
@@ -330,7 +330,11 @@ void share_xen_page_with_guest(
 
     page_set_owner(page, d);
     wmb(); /* install valid domain ptr before updating refcnt. */
-    ASSERT((page->count_info & (PGC_allocated|PGC_count_mask)) == 0);
+#ifdef __i386__
+    ASSERT(page->count_info == 0);
+#else
+    ASSERT((page->count_info & ~PGC_xen_heap) == 0);
+#endif
 
     /* Only add to the allocation list if the domain isn't dying. */
     if ( !d->is_dying )
@@ -1946,7 +1950,8 @@ int get_page(struct page_info *page, str
  fail:
     if ( !_shadow_mode_refcounts(domain) && !domain->is_dying )
         gdprintk(XENLOG_INFO,
-                 "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info,
+                 "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%"
+                 PRtype_info "\n",
                  page_to_mfn(page), domain, page_get_owner(page),
                  y, page->u.inuse.type_info);
     return 0;

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