1 files changed, 10 insertions, 6 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b6a34b32d8ac..c314a362c167 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -793,11 +793,13 @@ out_unlock:
                 pte_free(mm, pgtable);
 }
 
-vm_fault_t vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
-                        pmd_t *pmd, pfn_t pfn, bool write)
+vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write)
 {
+        unsigned long addr = vmf->address & PMD_MASK;
+        struct vm_area_struct *vma = vmf->vma;
         pgprot_t pgprot = vma->vm_page_prot;
         pgtable_t pgtable = NULL;
+
         /*
          * If we had pmd_special, we could avoid all these restrictions,
          * but we need to be consistent with PTEs and architectures that
@@ -820,7 +822,7 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,
 
         track_pfn_insert(vma, &pgprot, pfn);
 
-        insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write, pgtable);
+        insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, pgtable);
         return VM_FAULT_NOPAGE;
 }
 EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd);
@@ -869,10 +871,12 @@ out_unlock:
         spin_unlock(ptl);
 }
 
-vm_fault_t vmf_insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr,
-                        pud_t *pud, pfn_t pfn, bool write)
+vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write)
 {
+        unsigned long addr = vmf->address & PUD_MASK;
+        struct vm_area_struct *vma = vmf->vma;
         pgprot_t pgprot = vma->vm_page_prot;
+
         /*
          * If we had pud_special, we could avoid all these restrictions,
          * but we need to be consistent with PTEs and architectures that
@@ -889,7 +893,7 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr,
 
         track_pfn_insert(vma, &pgprot, pfn);
 
-        insert_pfn_pud(vma, addr, pud, pfn, pgprot, write);
+        insert_pfn_pud(vma, addr, vmf->pud, pfn, pgprot, write);
         return VM_FAULT_NOPAGE;
 }
 EXPORT_SYMBOL_GPL(vmf_insert_pfn_pud);