commit 36bb94ba36f332de767cfaa3af6a5136435a3a9c
author Russell King <rmk+kernel@arm.linux.org.uk> Tue Nov 16 08:40:36 2010 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Dec 22 11:05:35 2010 +0000
tree 45d1bd890b58658f4db58a033e619e511e3368f4
parent 9522d7e4cb5e0858122fc55d33a2c07728f0b10d

ARM: pgtable: provide RDONLY page table bit rather than WRITE bit

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mm/proc-v7.S

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 4f5a594..210d051 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -140,9 +140,9 @@
 	tst	r1, #1 << 4
 	orrne	r3, r3, #PTE_EXT_TEX(1)
 
-	tst	r1, #L_PTE_WRITE
-	tstne	r1, #L_PTE_DIRTY
-	orreq	r3, r3, #PTE_EXT_APX
+	eor	r1, r1, #L_PTE_DIRTY
+	tst	r1, #L_PTE_RDONLY | L_PTE_DIRTY
+	orrne	r3, r3, #PTE_EXT_APX
 
 	tst	r1, #L_PTE_USER
 	orrne	r3, r3, #PTE_EXT_AP1