1 files changed, 5 insertions, 30 deletions

diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 2f5ce7230a43..c6070e70dd73 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -724,25 +724,6 @@ static long privcmd_ioctl_restrict(struct file *file, void __user *udata)
         return 0;
 }
 
-struct remap_pfn {
-        struct mm_struct *mm;
-        struct page **pages;
-        pgprot_t prot;
-        unsigned long i;
-};
-
-static int remap_pfn_fn(pte_t *ptep, unsigned long addr, void *data)
-{
-        struct remap_pfn *r = data;
-        struct page *page = r->pages[r->i];
-        pte_t pte = pte_mkspecial(pfn_pte(page_to_pfn(page), r->prot));
-
-        set_pte_at(r->mm, addr, ptep, pte);
-        r->i++;
-
-        return 0;
-}
-
 static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)
 {
         struct privcmd_data *data = file->private_data;
@@ -774,7 +755,8 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)
                 goto out;
         }
 
-        if (xen_feature(XENFEAT_auto_translated_physmap)) {
+        if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) &&
+            xen_feature(XENFEAT_auto_translated_physmap)) {
                 unsigned int nr = DIV_ROUND_UP(kdata.num, XEN_PFN_PER_PAGE);
                 struct page **pages;
                 unsigned int i;
@@ -808,16 +790,9 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)
         if (rc)
                 goto out;
 
-        if (xen_feature(XENFEAT_auto_translated_physmap)) {
-                struct remap_pfn r = {
-                        .mm = vma->vm_mm,
-                        .pages = vma->vm_private_data,
-                        .prot = vma->vm_page_prot,
-                };
-
-                rc = apply_to_page_range(r.mm, kdata.addr,
-                                         kdata.num << PAGE_SHIFT,
-                                         remap_pfn_fn, &r);
+        if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) &&
+            xen_feature(XENFEAT_auto_translated_physmap)) {
+                rc = xen_remap_vma_range(vma, kdata.addr, kdata.num << PAGE_SHIFT);
         } else {
                 unsigned int domid =
                         (xdata.flags & XENMEM_rsrc_acq_caller_owned) ?