diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
| commit | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (patch) | |
| tree | 38b829a0bfe220f8486ab4f771910738c83161be /arch/arm/mm/proc-fa526.S | |
| parent | 2ff0720933f9a5e502a46fb6ea14ceeaad65131f (diff) | |
| parent | f4daf06fc23b99df5ca5b3e892428b91e148cc52 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
Diffstat (limited to 'arch/arm/mm/proc-fa526.S')
| -rw-r--r-- | arch/arm/mm/proc-fa526.S | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S index fc2a4ae15cf4..4c7a5710472b 100644 --- a/arch/arm/mm/proc-fa526.S +++ b/arch/arm/mm/proc-fa526.S @@ -180,42 +180,14 @@ fa526_cr1_set: __INITDATA -/* - * Purpose : Function pointers used to access above functions - all calls - * come through these - */ - .type fa526_processor_functions, #object -fa526_processor_functions: - .word v4_early_abort - .word legacy_pabort - .word cpu_fa526_proc_init - .word cpu_fa526_proc_fin - .word cpu_fa526_reset - .word cpu_fa526_do_idle - .word cpu_fa526_dcache_clean_area - .word cpu_fa526_switch_mm - .word cpu_fa526_set_pte_ext - .word 0 - .word 0 - .word 0 - .size fa526_processor_functions, . - fa526_processor_functions + @ define struct processor (see <asm/proc-fns.h> and proc-macros.S) + define_processor_functions fa526, dabort=v4_early_abort, pabort=legacy_pabort .section ".rodata" - .type cpu_arch_name, #object -cpu_arch_name: - .asciz "armv4" - .size cpu_arch_name, . - cpu_arch_name - - .type cpu_elf_name, #object -cpu_elf_name: - .asciz "v4" - .size cpu_elf_name, . - cpu_elf_name - - .type cpu_fa526_name, #object -cpu_fa526_name: - .asciz "FA526" - .size cpu_fa526_name, . - cpu_fa526_name + string cpu_arch_name, "armv4" + string cpu_elf_name, "v4" + string cpu_fa526_name, "FA526" .align |