Merge tag 'cris-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / mm / gup.c

diff --git a/mm/gup.c b/mm/gup.c
index ca7b607..6297f6b 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1019,7 +1019,7 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
                 *
                 * for an example see gup_get_pte in arch/x86/mm/gup.c
                 */
-               pte_t pte = ACCESS_ONCE(*ptep);
+               pte_t pte = READ_ONCE(*ptep);
                struct page *page;
 
                /*
@@ -1309,7 +1309,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
        local_irq_save(flags);
        pgdp = pgd_offset(mm, addr);
        do {
-               pgd_t pgd = ACCESS_ONCE(*pgdp);
+               pgd_t pgd = READ_ONCE(*pgdp);
 
                next = pgd_addr_end(addr, end);
                if (pgd_none(pgd))