1 files changed, 1 insertions, 4 deletions

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index c81046323ebc..ac55c02f98e9 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -340,8 +340,6 @@ static void __init xen_do_set_identity_and_remap_chunk(
 
         WARN_ON(size == 0);
 
-        BUG_ON(xen_feature(XENFEAT_auto_translated_physmap));
-
         mfn_save = virt_to_mfn(buf);
 
         for (ident_pfn_iter = start_pfn, remap_pfn_iter = remap_pfn;
@@ -1024,8 +1022,7 @@ void __init xen_pvmmu_arch_setup(void)
 void __init xen_arch_setup(void)
 {
         xen_panic_handler_init();
-        if (!xen_feature(XENFEAT_auto_translated_physmap))
-                xen_pvmmu_arch_setup();
+        xen_pvmmu_arch_setup();
 
 #ifdef CONFIG_ACPI
         if (!(xen_start_info->flags & SIF_INITDOMAIN)) {