arm64: Move PTE_RDONLY bit handling out of set_pte_at()

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

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 430eaf8..f75ed5c 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -204,11 +204,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma,
                return 0;
 
        /* only preserve the access flags and write permission */
-       pte_val(entry) &= PTE_AF | PTE_WRITE | PTE_DIRTY;
-
-       /* set PTE_RDONLY if actual read-only or clean PTE */
-       if (!pte_write(entry) || !pte_sw_dirty(entry))
-               entry = pte_set_rdonly(entry);
+       pte_val(entry) &= PTE_RDONLY | PTE_AF | PTE_WRITE | PTE_DIRTY;
 
        /*
         * Setting the flags must be done atomically to avoid racing with the