aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-macros.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/proc-macros.S')
-rw-r--r--arch/arm/mm/proc-macros.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 7d63beaf9745..cbedf9c46b9d 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -121,7 +121,7 @@
121 .endm 121 .endm
122 122
123 .macro armv6_set_pte_ext pfx 123 .macro armv6_set_pte_ext pfx
124 str r1, [r0], #-2048 @ linux version 124 str r1, [r0], #2048 @ linux version
125 125
126 bic r3, r1, #0x000003fc 126 bic r3, r1, #0x000003fc
127 bic r3, r3, #PTE_TYPE_MASK 127 bic r3, r3, #PTE_TYPE_MASK
@@ -170,7 +170,7 @@
170 * 1111 0xff r/w r/w 170 * 1111 0xff r/w r/w
171 */ 171 */
172 .macro armv3_set_pte_ext wc_disable=1 172 .macro armv3_set_pte_ext wc_disable=1
173 str r1, [r0], #-2048 @ linux version 173 str r1, [r0], #2048 @ linux version
174 174
175 eor r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY 175 eor r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
176 176
@@ -193,7 +193,7 @@
193 bicne r2, r2, #PTE_BUFFERABLE 193 bicne r2, r2, #PTE_BUFFERABLE
194#endif 194#endif
195 .endif 195 .endif
196 str r2, [r0] @ hardware version 196 str r2, [r0] @ hardware version
197 .endm 197 .endm
198 198
199 199
@@ -213,7 +213,7 @@
213 * 1111 11 r/w r/w 213 * 1111 11 r/w r/w
214 */ 214 */
215 .macro xscale_set_pte_ext_prologue 215 .macro xscale_set_pte_ext_prologue
216 str r1, [r0], #-2048 @ linux version 216 str r1, [r0] @ linux version
217 217
218 eor r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY 218 eor r3, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
219 219
@@ -232,7 +232,7 @@
232 tst r3, #L_PTE_PRESENT | L_PTE_YOUNG @ present and young? 232 tst r3, #L_PTE_PRESENT | L_PTE_YOUNG @ present and young?
233 movne r2, #0 @ no -> fault 233 movne r2, #0 @ no -> fault
234 234
235 str r2, [r0] @ hardware version 235 str r2, [r0, #2048]! @ hardware version
236 mov ip, #0 236 mov ip, #0
237 mcr p15, 0, r0, c7, c10, 1 @ clean L1 D line 237 mcr p15, 0, r0, c7, c10, 1 @ clean L1 D line
238 mcr p15, 0, ip, c7, c10, 4 @ data write barrier 238 mcr p15, 0, ip, c7, c10, 4 @ data write barrier