arm64/mm: convert READ_ONCE(*ptep) to ptep_get(ptep)

[linux-2.6-microblaze.git] / arch / arm64 / mm / mmu.c

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 3a27d88..343629a 100644 (file)
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -173,7 +173,7 @@ static void init_pte(pmd_t *pmdp, unsigned long addr, unsigned long end,
 
        ptep = pte_set_fixmap_offset(pmdp, addr);
        do {
-               pte_t old_pte = READ_ONCE(*ptep);
+               pte_t old_pte = ptep_get(ptep);
 
                set_pte(ptep, pfn_pte(__phys_to_pfn(phys), prot));
 
@@ -182,7 +182,7 @@ static void init_pte(pmd_t *pmdp, unsigned long addr, unsigned long end,
                 * only allow updates to the permission attributes.
                 */
                BUG_ON(!pgattr_change_is_safe(pte_val(old_pte),
-                                             READ_ONCE(pte_val(*ptep))));
+                                             pte_val(ptep_get(ptep))));
 
                phys += PAGE_SIZE;
        } while (ptep++, addr += PAGE_SIZE, addr != end);
@@ -852,7 +852,7 @@ static void unmap_hotplug_pte_range(pmd_t *pmdp, unsigned long addr,
 
        do {
                ptep = pte_offset_kernel(pmdp, addr);
-               pte = READ_ONCE(*ptep);
+               pte = ptep_get(ptep);
                if (pte_none(pte))
                        continue;
 
@@ -985,7 +985,7 @@ static void free_empty_pte_table(pmd_t *pmdp, unsigned long addr,
 
        do {
                ptep = pte_offset_kernel(pmdp, addr);
-               pte = READ_ONCE(*ptep);
+               pte = ptep_get(ptep);
 
                /*
                 * This is just a sanity check here which verifies that
@@ -1004,7 +1004,7 @@ static void free_empty_pte_table(pmd_t *pmdp, unsigned long addr,
         */
        ptep = pte_offset_kernel(pmdp, 0UL);
        for (i = 0; i < PTRS_PER_PTE; i++) {
-               if (!pte_none(READ_ONCE(ptep[i])))
+               if (!pte_none(ptep_get(&ptep[i])))
                        return;
        }
 
@@ -1473,7 +1473,7 @@ pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte
                 * when the permission changes from executable to non-executable
                 * in cases where cpu is affected with errata #2645198.
                 */
-               if (pte_user_exec(READ_ONCE(*ptep)))
+               if (pte_user_exec(ptep_get(ptep)))
                        return ptep_clear_flush(vma, addr, ptep);
        }
        return ptep_get_and_clear(vma->vm_mm, addr, ptep);