diff options
Diffstat (limited to 'arch/arm/mm/proc-arm922.S')
-rw-r--r-- | arch/arm/mm/proc-arm922.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index 571f082f0247..ffb751b877ff 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <asm/assembler.h> | 31 | #include <asm/assembler.h> |
32 | #include <asm/elf.h> | ||
32 | #include <asm/pgtable-hwdef.h> | 33 | #include <asm/pgtable-hwdef.h> |
33 | #include <asm/pgtable.h> | 34 | #include <asm/pgtable.h> |
34 | #include <asm/procinfo.h> | ||
35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
36 | #include <asm/ptrace.h> | 36 | #include <asm/ptrace.h> |
37 | #include "proc-macros.S" | 37 | #include "proc-macros.S" |
@@ -348,12 +348,12 @@ ENTRY(cpu_arm922_switch_mm) | |||
348 | mov pc, lr | 348 | mov pc, lr |
349 | 349 | ||
350 | /* | 350 | /* |
351 | * cpu_arm922_set_pte(ptep, pte) | 351 | * cpu_arm922_set_pte_ext(ptep, pte, ext) |
352 | * | 352 | * |
353 | * Set a PTE and flush it out | 353 | * Set a PTE and flush it out |
354 | */ | 354 | */ |
355 | .align 5 | 355 | .align 5 |
356 | ENTRY(cpu_arm922_set_pte) | 356 | ENTRY(cpu_arm922_set_pte_ext) |
357 | #ifdef CONFIG_MMU | 357 | #ifdef CONFIG_MMU |
358 | str r1, [r0], #-2048 @ linux version | 358 | str r1, [r0], #-2048 @ linux version |
359 | 359 | ||
@@ -427,7 +427,7 @@ arm922_processor_functions: | |||
427 | .word cpu_arm922_do_idle | 427 | .word cpu_arm922_do_idle |
428 | .word cpu_arm922_dcache_clean_area | 428 | .word cpu_arm922_dcache_clean_area |
429 | .word cpu_arm922_switch_mm | 429 | .word cpu_arm922_switch_mm |
430 | .word cpu_arm922_set_pte | 430 | .word cpu_arm922_set_pte_ext |
431 | .size arm922_processor_functions, . - arm922_processor_functions | 431 | .size arm922_processor_functions, . - arm922_processor_functions |
432 | 432 | ||
433 | .section ".rodata" | 433 | .section ".rodata" |