Commit f2f9b0fc authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP: Undo of Imre Deak's v6 prot bits

This is not needed any longer with RMK's patch.
parent 42cb999d
...@@ -123,11 +123,11 @@ ENTRY(cpu_v6_switch_mm) ...@@ -123,11 +123,11 @@ ENTRY(cpu_v6_switch_mm)
* Permissions: * Permissions:
* YUWD APX AP1 AP0 SVC User * YUWD APX AP1 AP0 SVC User
* 0xxx 0 0 0 no acc no acc * 0xxx 0 0 0 no acc no acc
* 100x 1 0 1 r/o no acc
* 10x0 1 0 1 r/o no acc * 10x0 1 0 1 r/o no acc
* 1001 0 0 1 r/w no acc
* 1011 0 0 1 r/w no acc * 1011 0 0 1 r/w no acc
* 11x0 1 1 0 r/o r/o * 110x 0 1 0 r/w r/o
* 1101 0 1 0 r/w r/o * 11x0 0 1 0 r/w r/o
* 1111 0 1 1 r/w r/w * 1111 0 1 1 r/w r/w
*/ */
ENTRY(cpu_v6_set_pte) ENTRY(cpu_v6_set_pte)
...@@ -137,16 +137,15 @@ ENTRY(cpu_v6_set_pte) ...@@ -137,16 +137,15 @@ ENTRY(cpu_v6_set_pte)
bic r2, r2, #0x00000003 bic r2, r2, #0x00000003
orr r2, r2, #PTE_EXT_AP0 | 2 orr r2, r2, #PTE_EXT_AP0 | 2
tst r1, #L_PTE_DIRTY tst r1, #L_PTE_WRITE
tstne r1, #L_PTE_DIRTY
orreq r2, r2, #PTE_EXT_APX orreq r2, r2, #PTE_EXT_APX
tst r1, #L_PTE_USER tst r1, #L_PTE_USER
orrne r2, r2, #PTE_EXT_AP1 orrne r2, r2, #PTE_EXT_AP1
bicne r2, r2, #PTE_EXT_AP0 tstne r2, #PTE_EXT_APX
tstne r1, #L_PTE_WRITE bicne r2, r2, #PTE_EXT_APX | PTE_EXT_AP0
tstne r1, #L_PTE_DIRTY
eorne r2, r2, #PTE_EXT_AP0
tst r1, #L_PTE_YOUNG tst r1, #L_PTE_YOUNG
biceq r2, r2, #PTE_EXT_APX | PTE_EXT_AP_MASK biceq r2, r2, #PTE_EXT_APX | PTE_EXT_AP_MASK
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment