From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Fri, 12 Jan 2007 10:13:25 +0000 (+0000)
Subject: [XEN] Consistent assumption that PTEs contain MFNs in both ptwr
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15405^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=11ee9a5faa25fc17e09c986134565825836730e9;p=xen.git

[XEN] Consistent assumption that PTEs contain MFNs in both ptwr
page-fault handler and ptwr emulation handler.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 5aed0051da..a4b93f2b70 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -3182,7 +3182,7 @@ static int ptwr_emulated_update(
     unsigned int do_cmpxchg,
     struct ptwr_emulate_ctxt *ptwr_ctxt)
 {
-    unsigned long gmfn, mfn;
+    unsigned long mfn;
     struct page_info *page;
     l1_pgentry_t pte, ol1e, nl1e, *pl1e;
     struct vcpu *v = current;
@@ -3222,8 +3222,7 @@ static int ptwr_emulated_update(
     }
 
     pte  = ptwr_ctxt->pte;
-    gmfn = l1e_get_pfn(pte);
-    mfn  = gmfn_to_mfn(d, gmfn);
+    mfn  = l1e_get_pfn(pte);
     page = mfn_to_page(mfn);
 
     /* We are looking only for read-only mappings of p.t. pages. */