mm: gup: use get_user_pages_unlocked within get_user_pages_fast

[karo-tx-linux.git] / arch / mips / mm / gup.c

diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index 7cba480568c8f5d449b3b44870a515456f8441b2..349995d19c7f2c85ee1eeb83d7882d9558d96e03 100644 (file)
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -30,7 +30,7 @@ retry:
 
        return pte;
 #else
-       return ACCESS_ONCE(*ptep);
+       return READ_ONCE(*ptep);
 #endif
 }
 
@@ -301,11 +301,9 @@ slow_irqon:
        start += nr << PAGE_SHIFT;
        pages += nr;
 
-       down_read(&mm->mmap_sem);
-       ret = get_user_pages(current, mm, start,
-                               (end - start) >> PAGE_SHIFT,
-                               write, 0, pages, NULL);
-       up_read(&mm->mmap_sem);
+       ret = get_user_pages_unlocked(current, mm, start,
+                                     (end - start) >> PAGE_SHIFT,
+                                     write, 0, pages);
 
        /* Have to be a bit careful with return values */
        if (nr > 0) {