1 files changed, 4 insertions, 1 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f17b29210ac4..ffb101e45731 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1537,7 +1537,10 @@ asmlinkage __visible void __init xen_start_kernel(void)
         if (!xen_pvh_domain())
                 pv_cpu_ops = xen_cpu_ops;
 
-        x86_init.resources.memory_setup = xen_memory_setup;
+        if (xen_feature(XENFEAT_auto_translated_physmap))
+                x86_init.resources.memory_setup = xen_auto_xlated_memory_setup;
+        else
+                x86_init.resources.memory_setup = xen_memory_setup;
         x86_init.oem.arch_setup = xen_arch_setup;
         x86_init.oem.banner = xen_banner;