1 files changed, 3 insertions, 5 deletions

diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c
index 37458f38b220..e7af6a65baab 100644
--- a/arch/sh/mm/gup.c
+++ b/arch/sh/mm/gup.c
@@ -17,7 +17,7 @@
 static inline pte_t gup_get_pte(pte_t *ptep)
 {
 #ifndef CONFIG_X2TLB
-        return ACCESS_ONCE(*ptep);
+        return READ_ONCE(*ptep);
 #else
         /*
          * With get_user_pages_fast, we walk down the pagetables without
@@ -257,10 +257,8 @@ 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) {