ia64/xen-unstable

changeset 3747:b1937df6cdee

bitkeeper revision 1.1159.1.554 (4209402bTjMxzBx8aPHpjveufoaubQ)

manual merge
author iap10@labyrinth.cl.cam.ac.uk
date Tue Feb 08 22:41:47 2005 +0000 (2005-02-08)
parents 6637d3633038 73484d0fa776
children 31070c4d28c6
files xen/arch/x86/mm.c
line diff
     1.1 --- a/xen/arch/x86/mm.c	Tue Feb 08 19:57:32 2005 +0000
     1.2 +++ b/xen/arch/x86/mm.c	Tue Feb 08 22:41:47 2005 +0000
     1.3 @@ -2419,7 +2419,7 @@ void audit_domain(struct domain *d)
     1.4              scan_for_pfn( e, xpfn );            
     1.5      }   
     1.6  
     1.7 -    int i;
     1.8 +    int i, l1, l2;
     1.9      unsigned long pfn;
    1.10      struct list_head *list_ent;
    1.11      struct pfn_info *page;
    1.12 @@ -2661,6 +2661,7 @@ void audit_domain(struct domain *d)
    1.13  
    1.14      /* PHASE 3 */
    1.15      list_ent = d->page_list.next;
    1.16 +    l1 = l2 = 0;
    1.17      for ( i = 0; (list_ent != &d->page_list); i++ )
    1.18      {
    1.19          unsigned long *pt;
    1.20 @@ -2670,6 +2671,7 @@ void audit_domain(struct domain *d)
    1.21          switch ( page->u.inuse.type_info & PGT_type_mask )
    1.22          {
    1.23          case PGT_l2_page_table:
    1.24 +	    l2++;
    1.25              if ( (page->u.inuse.type_info & PGT_pinned) == PGT_pinned )
    1.26                  adjust( page, 1, 1 );          
    1.27  
    1.28 @@ -2696,6 +2698,7 @@ void audit_domain(struct domain *d)
    1.29              break;
    1.30  
    1.31          case PGT_l1_page_table:
    1.32 +	    l1++;
    1.33              if ( (page->u.inuse.type_info & PGT_pinned) == PGT_pinned )
    1.34                  adjust( page, 1, 1 );
    1.35  
    1.36 @@ -2737,7 +2740,7 @@ void audit_domain(struct domain *d)
    1.37          adjust(&frame_table[pagetable_val(
    1.38              d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
    1.39  
    1.40 -    printk("Audit %d: Done. pages=%d ctot=%d ttot=%d\n", d->id, i, ctot, ttot );
    1.41 +    printk("Audit %d: Done. pages=%d l1=%d l2=%d ctot=%d ttot=%d\n", d->id, i, l1, l2, ctot, ttot );
    1.42  
    1.43      if ( d != current->domain )
    1.44          domain_unpause(d);