Merge tag 'amd-drm-fixes-5.9-2020-08-20' of git://people.freedesktop.org/~agd5f/linux...

[linux-2.6-microblaze.git] / mm / hmm.c

diff --git a/mm/hmm.c b/mm/hmm.c
index 0809bae..943cb2b 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -75,7 +75,8 @@ static int hmm_vma_fault(unsigned long addr, unsigned long end,
        }
 
        for (; addr < end; addr += PAGE_SIZE)
-               if (handle_mm_fault(vma, addr, fault_flags) & VM_FAULT_ERROR)
+               if (handle_mm_fault(vma, addr, fault_flags, NULL) &
+                   VM_FAULT_ERROR)
                        return -EFAULT;
        return -EBUSY;
 }
@@ -249,7 +250,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr,
                swp_entry_t entry = pte_to_swp_entry(pte);
 
                /*
-                * Never fault in device private pages pages, but just report
+                * Never fault in device private pages, but just report
                 * the PFN even if not present.
                 */
                if (hmm_is_device_private_entry(range, entry)) {