ia64/xen-unstable

changeset 17029:bab9e298450a

x86: Compile fix for p2m audit code.

From Tom Woller.
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Feb 11 10:57:17 2008 +0000 (2008-02-11)
parents faefbf2c4840
children 17020f4eb0aa
files xen/arch/x86/mm/p2m.c
line diff
     1.1 --- a/xen/arch/x86/mm/p2m.c	Mon Feb 11 10:51:41 2008 +0000
     1.2 +++ b/xen/arch/x86/mm/p2m.c	Mon Feb 11 10:57:17 2008 +0000
     1.3 @@ -486,6 +486,7 @@ static void audit_p2m(struct domain *d)
     1.4      mfn_t p2mfn;
     1.5      unsigned long orphans_d = 0, orphans_i = 0, mpbad = 0, pmbad = 0;
     1.6      int test_linear;
     1.7 +    p2m_type_t type;
     1.8  
     1.9      if ( !paging_mode_translate(d) )
    1.10          return;
    1.11 @@ -534,7 +535,7 @@ static void audit_p2m(struct domain *d)
    1.12              continue;
    1.13          }
    1.14  
    1.15 -        p2mfn = gfn_to_mfn_foreign(d, gfn);
    1.16 +        p2mfn = gfn_to_mfn_foreign(d, gfn, &type);
    1.17          if ( mfn_x(p2mfn) != mfn )
    1.18          {
    1.19              mpbad++;
    1.20 @@ -547,12 +548,12 @@ static void audit_p2m(struct domain *d)
    1.21              /* This m2p entry is stale: the domain has another frame in
    1.22               * this physical slot.  No great disaster, but for neatness,
    1.23               * blow away the m2p entry. */
    1.24 -            set_gpfn_from_mfn(mfn, INVALID_M2P_ENTRY, __PAGE_HYPERVISOR|_PAGE_USER);
    1.25 +            set_gpfn_from_mfn(mfn, INVALID_M2P_ENTRY);
    1.26          }
    1.27  
    1.28          if ( test_linear && (gfn <= d->arch.p2m.max_mapped_pfn) )
    1.29          {
    1.30 -            lp2mfn = mfn_x(gfn_to_mfn_current(gfn));
    1.31 +            lp2mfn = mfn_x(gfn_to_mfn_current(gfn, &type));
    1.32              if ( lp2mfn != mfn_x(p2mfn) )
    1.33              {
    1.34                  P2M_PRINTK("linear mismatch gfn %#lx -> mfn %#lx "