[Xen-changelog] Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1712, 2005/02/08 19:57:32+00:00, ka...@sc...

	Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
	into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk



 mm.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


diff -Nru a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c	2005-02-08 15:04:02 -05:00
+++ b/xen/arch/x86/mm.c	2005-02-08 15:04:02 -05:00
@@ -2478,8 +2478,9 @@
 
 
     /* PHASE 1 */
-
-    adjust(&frame_table[pagetable_val(d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], -1, 1);
+    if ( pagetable_val(d->exec_domain[0]->arch.pagetable) )
+        adjust(&frame_table[pagetable_val(d->exec_domain[0]->arch.pagetable)
+                           >>PAGE_SHIFT], -1, 1);
 
     list_ent = d->page_list.next;
     for ( i = 0; (list_ent != &d->page_list); i++ )
@@ -2732,10 +2733,11 @@
 
     spin_unlock(&d->page_alloc_lock);
 
-    adjust(&frame_table[pagetable_val(
-        d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
+    if ( pagetable_val(d->exec_domain[0]->arch.pagetable) )
+        adjust(&frame_table[pagetable_val(
+            d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
 
-    printk("Audit %d: Done. ctot=%d ttot=%d\n", d->id, ctot, ttot );
+    printk("Audit %d: Done. pages=%d ctot=%d ttot=%d\n", d->id, i, ctot, ttot );
 
     if ( d != current->domain )
         domain_unpause(d);