From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 11 Feb 2008 10:57:17 +0000 (+0000)
Subject: x86: Compile fix for p2m audit code.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14317^2~47
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25c2136e0d717a4ca0275efe5270e0f9da2c7aea;p=xen.git

x86: Compile fix for p2m audit code.

From Tom Woller.
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index ee98ae8c6a..b82e7ef704 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -486,6 +486,7 @@ static void audit_p2m(struct domain *d)
     mfn_t p2mfn;
     unsigned long orphans_d = 0, orphans_i = 0, mpbad = 0, pmbad = 0;
     int test_linear;
+    p2m_type_t type;
 
     if ( !paging_mode_translate(d) )
         return;
@@ -534,7 +535,7 @@ static void audit_p2m(struct domain *d)
             continue;
         }
 
-        p2mfn = gfn_to_mfn_foreign(d, gfn);
+        p2mfn = gfn_to_mfn_foreign(d, gfn, &type);
         if ( mfn_x(p2mfn) != mfn )
         {
             mpbad++;
@@ -547,12 +548,12 @@ static void audit_p2m(struct domain *d)
             /* This m2p entry is stale: the domain has another frame in
              * this physical slot.  No great disaster, but for neatness,
              * blow away the m2p entry. */
-            set_gpfn_from_mfn(mfn, INVALID_M2P_ENTRY, __PAGE_HYPERVISOR|_PAGE_USER);
+            set_gpfn_from_mfn(mfn, INVALID_M2P_ENTRY);
         }
 
         if ( test_linear && (gfn <= d->arch.p2m.max_mapped_pfn) )
         {
-            lp2mfn = mfn_x(gfn_to_mfn_current(gfn));
+            lp2mfn = mfn_x(gfn_to_mfn_current(gfn, &type));
             if ( lp2mfn != mfn_x(p2mfn) )
             {
                 P2M_PRINTK("linear mismatch gfn %#lx -> mfn %#lx "