Merge tag 'x86_mm_for_6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[platform/kernel/linux-starfive.git] / mm / gup.c

diff --git a/mm/gup.c b/mm/gup.c
index 1f72a71..ff689c8 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1085,7 +1085,7 @@ static long __get_user_pages(struct mm_struct *mm,
        if (!nr_pages)
                return 0;
 
-       start = untagged_addr(start);
+       start = untagged_addr_remote(mm, start);
 
        VM_BUG_ON(!!pages != !!(gup_flags & (FOLL_GET | FOLL_PIN)));
 
@@ -1259,7 +1259,7 @@ int fixup_user_fault(struct mm_struct *mm,
        struct vm_area_struct *vma;
        vm_fault_t ret;
 
-       address = untagged_addr(address);
+       address = untagged_addr_remote(mm, address);
 
        if (unlocked)
                fault_flags |= FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;