ARM: mm: proc-arm946: Use the new processor struct macros

Signed-off-by: Dave Martin <dave.martin@linaro.org>
This commit is contained in:
Dave Martin 2011-06-23 17:21:17 +01:00
parent b375580147
commit b1b9892bcd

View File

@ -306,18 +306,8 @@ ENTRY(arm946_dma_unmap_area)
mov pc, lr mov pc, lr
ENDPROC(arm946_dma_unmap_area) ENDPROC(arm946_dma_unmap_area)
ENTRY(arm946_cache_fns) @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
.long arm946_flush_icache_all define_cache_functions arm946
.long arm946_flush_kern_cache_all
.long arm946_flush_user_cache_all
.long arm946_flush_user_cache_range
.long arm946_coherent_kern_range
.long arm946_coherent_user_range
.long arm946_flush_kern_dcache_area
.long arm946_dma_map_area
.long arm946_dma_unmap_area
.long arm946_dma_flush_range
ENTRY(cpu_arm946_dcache_clean_area) ENTRY(cpu_arm946_dcache_clean_area)
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
@ -403,43 +393,14 @@ __arm946_setup:
__INITDATA __INITDATA
/* @ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
* Purpose : Function pointers used to access above functions - all calls define_processor_functions arm946, dabort=nommu_early_abort, pabort=legacy_pabort, nommu=1
* come through these
*/
.type arm946_processor_functions, #object
ENTRY(arm946_processor_functions)
.word nommu_early_abort
.word legacy_pabort
.word cpu_arm946_proc_init
.word cpu_arm946_proc_fin
.word cpu_arm946_reset
.word cpu_arm946_do_idle
.word cpu_arm946_dcache_clean_area
.word cpu_arm946_switch_mm
.word 0 @ cpu_*_set_pte
.word 0
.word 0
.word 0
.size arm946_processor_functions, . - arm946_processor_functions
.section ".rodata" .section ".rodata"
.type cpu_arch_name, #object string cpu_arch_name, "armv5te"
cpu_arch_name: string cpu_elf_name, "v5t"
.asciz "armv5te" string cpu_arm946_name, "ARM946E-S"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
cpu_elf_name:
.asciz "v5t"
.size cpu_elf_name, . - cpu_elf_name
.type cpu_arm946_name, #object
cpu_arm946_name:
.ascii "ARM946E-S"
.size cpu_arm946_name, . - cpu_arm946_name
.align .align