From: Roger Pau Monné <roger.pau@citrix.com>
Date: Wed, 20 Dec 2017 08:59:21 +0000 (+0100)
Subject: x86/dom0: remove autotranslate leftovers
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~897
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2b0dd94548893cacda6e78d9125963d440ea870;p=xen.git

x86/dom0: remove autotranslate leftovers

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index a13412efb9..6a5fc326f7 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -642,13 +642,10 @@ int __init dom0_construct_pv(struct domain *d,
                                     L1_PROT : COMPAT_L1_PROT));
         l1tab++;
 
-        if ( !paging_mode_translate(d) )
-        {
-            page = mfn_to_page(mfn);
-            if ( !page->u.inuse.type_info &&
-                 !get_page_and_type(page, d, PGT_writable_page) )
-                BUG();
-        }
+        page = mfn_to_page(mfn);
+        if ( !page->u.inuse.type_info &&
+             !get_page_and_type(page, d, PGT_writable_page) )
+            BUG();
     }
 
     if ( is_pv_32bit_domain(d) )
@@ -790,7 +787,7 @@ int __init dom0_construct_pv(struct domain *d,
         if ( get_gpfn_from_mfn(mfn) >= count )
         {
             BUG_ON(is_pv_32bit_domain(d));
-            if ( !paging_mode_translate(d) && !page->u.inuse.type_info &&
+            if ( !page->u.inuse.type_info &&
                  !get_page_and_type(page, d, PGT_writable_page) )
                 BUG();