aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Martin <dave.martin@linaro.org>2011-06-23 12:26:19 -0400
committerDave Martin <dave.martin@linaro.org>2011-07-07 10:31:11 -0400
commit78a8f3c365b8851eb9862c54425e95bfd523f22d (patch)
tree0d7060d549772aaf6f2d900aa098fd88690f0deb
parent7b7dc6e8885b863beef189ade5971ff14781a971 (diff)
ARM: mm: proc-v7: Use the new processor struct macros
Signed-off-by: Dave Martin <dave.martin@linaro.org>
-rw-r--r--arch/arm/mm/proc-v7.S31
1 files changed, 5 insertions, 26 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 089c0b5e454f..a2e1ee87a2c4 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -173,8 +173,7 @@ ENTRY(cpu_v7_set_pte_ext)
173 mov pc, lr 173 mov pc, lr
174ENDPROC(cpu_v7_set_pte_ext) 174ENDPROC(cpu_v7_set_pte_ext)
175 175
176cpu_v7_name: 176 string cpu_v7_name, "ARMv7 Processor"
177 .ascii "ARMv7 Processor"
178 .align 177 .align
179 178
180 /* 179 /*
@@ -411,33 +410,13 @@ __v7_setup_stack:
411 410
412 __INITDATA 411 __INITDATA
413 412
414 .type v7_processor_functions, #object 413 @ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
415ENTRY(v7_processor_functions) 414 define_processor_functions v7, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
416 .word v7_early_abort
417 .word v7_pabort
418 .word cpu_v7_proc_init
419 .word cpu_v7_proc_fin
420 .word cpu_v7_reset
421 .word cpu_v7_do_idle
422 .word cpu_v7_dcache_clean_area
423 .word cpu_v7_switch_mm
424 .word cpu_v7_set_pte_ext
425 .word cpu_v7_suspend_size
426 .word cpu_v7_do_suspend
427 .word cpu_v7_do_resume
428 .size v7_processor_functions, . - v7_processor_functions
429 415
430 .section ".rodata" 416 .section ".rodata"
431 417
432 .type cpu_arch_name, #object 418 string cpu_arch_name, "armv7"
433cpu_arch_name: 419 string cpu_elf_name, "v7"
434 .asciz "armv7"
435 .size cpu_arch_name, . - cpu_arch_name
436
437 .type cpu_elf_name, #object
438cpu_elf_name:
439 .asciz "v7"
440 .size cpu_elf_name, . - cpu_elf_name
441 .align 420 .align
442 421
443 .section ".proc.info.init", #alloc, #execinstr 422 .section ".proc.info.init", #alloc, #execinstr