From cedadf27c0715bb88a17bacaebd236a5535f8eec Mon Sep 17 00:00:00 2001 From: Dave Martin Date: Thu, 23 Jun 2011 17:26:19 +0100 Subject: [PATCH] --- yaml --- r: 258297 b: refs/heads/master c: 78a8f3c365b8851eb9862c54425e95bfd523f22d h: refs/heads/master i: 258295: 2b6791c100c84fc628961bffc6f4698de06b15c9 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/proc-v7.S | 31 +++++-------------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index bdd4d62bd71c..a7567f45135e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b7dc6e8885b863beef189ade5971ff14781a971 +refs/heads/master: 78a8f3c365b8851eb9862c54425e95bfd523f22d diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/arch/arm/mm/proc-v7.S index 089c0b5e454f..a2e1ee87a2c4 100644 --- a/trunk/arch/arm/mm/proc-v7.S +++ b/trunk/arch/arm/mm/proc-v7.S @@ -173,8 +173,7 @@ ENTRY(cpu_v7_set_pte_ext) mov pc, lr ENDPROC(cpu_v7_set_pte_ext) -cpu_v7_name: - .ascii "ARMv7 Processor" + string cpu_v7_name, "ARMv7 Processor" .align /* @@ -411,33 +410,13 @@ __v7_setup_stack: __INITDATA - .type v7_processor_functions, #object -ENTRY(v7_processor_functions) - .word v7_early_abort - .word v7_pabort - .word cpu_v7_proc_init - .word cpu_v7_proc_fin - .word cpu_v7_reset - .word cpu_v7_do_idle - .word cpu_v7_dcache_clean_area - .word cpu_v7_switch_mm - .word cpu_v7_set_pte_ext - .word cpu_v7_suspend_size - .word cpu_v7_do_suspend - .word cpu_v7_do_resume - .size v7_processor_functions, . - v7_processor_functions + @ define struct processor (see and proc-macros.S) + define_processor_functions v7, dabort=v7_early_abort, pabort=v7_pabort, suspend=1 .section ".rodata" - .type cpu_arch_name, #object -cpu_arch_name: - .asciz "armv7" - .size cpu_arch_name, . - cpu_arch_name - - .type cpu_elf_name, #object -cpu_elf_name: - .asciz "v7" - .size cpu_elf_name, . - cpu_elf_name + string cpu_arch_name, "armv7" + string cpu_elf_name, "v7" .align .section ".proc.info.init", #alloc, #execinstr