diff options
Diffstat (limited to 'arch/arm/mm/proc-arm6_7.S')
-rw-r--r-- | arch/arm/mm/proc-arm6_7.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S index 0432e4806888..123a7dc7a433 100644 --- a/arch/arm/mm/proc-arm6_7.S +++ b/arch/arm/mm/proc-arm6_7.S | |||
@@ -15,9 +15,9 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <asm/assembler.h> | 16 | #include <asm/assembler.h> |
17 | #include <asm/asm-offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/elf.h> | ||
18 | #include <asm/pgtable-hwdef.h> | 19 | #include <asm/pgtable-hwdef.h> |
19 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
20 | #include <asm/procinfo.h> | ||
21 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
22 | 22 | ||
23 | ENTRY(cpu_arm6_dcache_clean_area) | 23 | ENTRY(cpu_arm6_dcache_clean_area) |
@@ -209,14 +209,14 @@ ENTRY(cpu_arm7_switch_mm) | |||
209 | mov pc, lr | 209 | mov pc, lr |
210 | 210 | ||
211 | /* | 211 | /* |
212 | * Function: arm6_7_set_pte(pte_t *ptep, pte_t pte) | 212 | * Function: arm6_7_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext) |
213 | * Params : r0 = Address to set | 213 | * Params : r0 = Address to set |
214 | * : r1 = value to set | 214 | * : r1 = value to set |
215 | * Purpose : Set a PTE and flush it out of any WB cache | 215 | * Purpose : Set a PTE and flush it out of any WB cache |
216 | */ | 216 | */ |
217 | .align 5 | 217 | .align 5 |
218 | ENTRY(cpu_arm6_set_pte) | 218 | ENTRY(cpu_arm6_set_pte_ext) |
219 | ENTRY(cpu_arm7_set_pte) | 219 | ENTRY(cpu_arm7_set_pte_ext) |
220 | #ifdef CONFIG_MMU | 220 | #ifdef CONFIG_MMU |
221 | str r1, [r0], #-2048 @ linux version | 221 | str r1, [r0], #-2048 @ linux version |
222 | 222 | ||
@@ -299,7 +299,7 @@ ENTRY(arm6_processor_functions) | |||
299 | .word cpu_arm6_do_idle | 299 | .word cpu_arm6_do_idle |
300 | .word cpu_arm6_dcache_clean_area | 300 | .word cpu_arm6_dcache_clean_area |
301 | .word cpu_arm6_switch_mm | 301 | .word cpu_arm6_switch_mm |
302 | .word cpu_arm6_set_pte | 302 | .word cpu_arm6_set_pte_ext |
303 | .size arm6_processor_functions, . - arm6_processor_functions | 303 | .size arm6_processor_functions, . - arm6_processor_functions |
304 | 304 | ||
305 | /* | 305 | /* |
@@ -315,7 +315,7 @@ ENTRY(arm7_processor_functions) | |||
315 | .word cpu_arm7_do_idle | 315 | .word cpu_arm7_do_idle |
316 | .word cpu_arm7_dcache_clean_area | 316 | .word cpu_arm7_dcache_clean_area |
317 | .word cpu_arm7_switch_mm | 317 | .word cpu_arm7_switch_mm |
318 | .word cpu_arm7_set_pte | 318 | .word cpu_arm7_set_pte_ext |
319 | .size arm7_processor_functions, . - arm7_processor_functions | 319 | .size arm7_processor_functions, . - arm7_processor_functions |
320 | 320 | ||
321 | .section ".rodata" | 321 | .section ".rodata" |