From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Mon, 16 Feb 2009 17:38:44 +0000 (+0000)
Subject: Revert "Import CS 18788 from xen-unstable."
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=feee5752cf0145588601b28eed013f9adc839ec1;p=xenclient%2Fxen.git

Revert "Import CS 18788 from xen-unstable."

This reverts commit 67fa2a3c5bce77d1f0528f498d5c49da270dddd8.
---

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 986af90..b076282 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1533,7 +1533,6 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e,
     struct domain *d = curr->domain;
     unsigned long mfn;
     struct page_info *l1pg = mfn_to_page(gl1mfn);
-    p2m_type_t p2mt;
     int rc = 1;
 
     page_lock(l1pg);
@@ -1551,8 +1550,8 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e,
     if ( l1e_get_flags(nl1e) & _PAGE_PRESENT )
     {
         /* Translate foreign guest addresses. */
-        mfn = mfn_x(gfn_to_mfn(FOREIGNDOM, l1e_get_pfn(nl1e), &p2mt));
-        if ( !p2m_is_ram(p2mt) || unlikely(mfn == INVALID_MFN) )
+        mfn = gmfn_to_mfn(FOREIGNDOM, l1e_get_pfn(nl1e));
+        if ( unlikely(mfn == INVALID_MFN) )
             return page_unlock(l1pg), 0;
         ASSERT((mfn & ~(PADDR_MASK >> PAGE_SHIFT)) == 0);
         nl1e = l1e_from_pfn(mfn, l1e_get_flags(nl1e));