From patchwork Tue Jun 14 10:58:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot for Dave Martin X-Patchwork-Id: 878822 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5EAxM40010113 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 14 Jun 2011 10:59:43 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWRKy-0001tm-PQ; Tue, 14 Jun 2011 10:59:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QWRKy-0002Ph-Bl; Tue, 14 Jun 2011 10:59:12 +0000 Received: from mail-ww0-f49.google.com ([74.125.82.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWRKN-0002Ik-J2 for linux-arm-kernel@lists.infradead.org; Tue, 14 Jun 2011 10:58:36 +0000 Received: by wwb39 with SMTP id 39so4458132wwb.18 for ; Tue, 14 Jun 2011 03:58:34 -0700 (PDT) Received: by 10.227.165.202 with SMTP id j10mr3382658wby.18.1308049113982; Tue, 14 Jun 2011 03:58:33 -0700 (PDT) Received: from e200948.peterhouse.linaro.org (fw-lnat.cambridge.arm.com [217.140.96.63]) by mx.google.com with ESMTPS id c17sm4938057wbh.29.2011.06.14.03.58.32 (version=SSLv3 cipher=OTHER); Tue, 14 Jun 2011 03:58:33 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 2/5] ARM: proc-v7: Use new generic struct definition macros Date: Tue, 14 Jun 2011 11:58:22 +0100 Message-Id: <1308049105-16080-3-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1308049105-16080-1-git-send-email-dave.martin@linaro.org> References: <1308049105-16080-1-git-send-email-dave.martin@linaro.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110614_065835_758333_F4EEF5D3 X-CRM114-Status: UNSURE ( 8.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Jun 2011 10:59:43 +0000 (UTC) Signed-off-by: Dave Martin --- arch/arm/mm/proc-v7.S | 46 ++++++++-------------------------------------- 1 files changed, 8 insertions(+), 38 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index b3b566e..c5cf6ea 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -171,8 +171,6 @@ ENTRY(cpu_v7_set_pte_ext) mov pc, lr ENDPROC(cpu_v7_set_pte_ext) -cpu_v7_name: - .ascii "ARMv7 Processor" .align /* @@ -403,36 +401,8 @@ v7_crval: __v7_setup_stack: .space 4 * 11 @ 11 registers - __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 0 - .word 0 - .word 0 - .size v7_processor_functions, . - v7_processor_functions - - .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 - .align + define_processor_functions v7, dabort=v7_early, pabort=v7 + define_proc_names v7, "armv7", "v7", "ARMv7 Processor" .section ".proc.info.init", #alloc, #execinstr @@ -455,10 +425,10 @@ __v7_ca9mp_proc_info: PMD_SECT_AP_WRITE | \ PMD_SECT_AP_READ W(b) __v7_ca9mp_setup - .long cpu_arch_name - .long cpu_elf_name + .long v7_arch_name + .long v7_elf_name .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS - .long cpu_v7_name + .long v7_cpu_name .long v7_processor_functions .long v7wbi_tlb_fns .long v6_user_fns @@ -487,10 +457,10 @@ __v7_proc_info: PMD_SECT_AP_WRITE | \ PMD_SECT_AP_READ W(b) __v7_setup - .long cpu_arch_name - .long cpu_elf_name + .long v7_arch_name + .long v7_elf_name .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS - .long cpu_v7_name + .long v7_cpu_name .long v7_processor_functions .long v7wbi_tlb_fns .long v6_user_fns