diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-06 12:19:08 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-01 11:40:52 -0400 |
commit | da0916539d20f257dfa46784357300e49d6bfd00 (patch) | |
tree | e581749819a4a7e5aea471c242a51773a360bd1d /arch/arm/mm/proc-sa1100.S | |
parent | 1ad77a876da48331451698cc4172c90ab9b6372f (diff) |
[ARM] Convert set_pte_ext implementions to macros
There are actually only four separate implementations of set_pte_ext.
Use assembler macros to insert code for these into the proc-*.S files.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/proc-sa1100.S')
-rw-r--r-- | arch/arm/mm/proc-sa1100.S | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index 871ba018252e..8e85e7cbc82f 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S | |||
@@ -166,24 +166,7 @@ ENTRY(cpu_sa1100_switch_mm) | |||
166 | .align 5 | 166 | .align 5 |
167 | ENTRY(cpu_sa1100_set_pte_ext) | 167 | ENTRY(cpu_sa1100_set_pte_ext) |
168 | #ifdef CONFIG_MMU | 168 | #ifdef CONFIG_MMU |
169 | str r1, [r0], #-2048 @ linux version | 169 | armv3_set_pte_ext wc_disable=0 |
170 | |||
171 | eor r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY | ||
172 | |||
173 | bic r2, r1, #PTE_SMALL_AP_MASK | ||
174 | bic r2, r2, #PTE_TYPE_MASK | ||
175 | orr r2, r2, #PTE_TYPE_SMALL | ||
176 | |||
177 | tst r1, #L_PTE_USER @ User? | ||
178 | orrne r2, r2, #PTE_SMALL_AP_URO_SRW | ||
179 | |||
180 | tst r1, #L_PTE_WRITE | L_PTE_DIRTY @ Write and Dirty? | ||
181 | orreq r2, r2, #PTE_SMALL_AP_UNO_SRW | ||
182 | |||
183 | tst r1, #L_PTE_PRESENT | L_PTE_YOUNG @ Present and Young? | ||
184 | movne r2, #0 | ||
185 | |||
186 | str r2, [r0] @ hardware version | ||
187 | mov r0, r0 | 170 | mov r0, r0 |
188 | mcr p15, 0, r0, c7, c10, 1 @ clean D entry | 171 | mcr p15, 0, r0, c7, c10, 1 @ clean D entry |
189 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 172 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |