From patchwork Tue Jun 14 10:58:24 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: 878852 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 p5EB018a010404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 14 Jun 2011 11:00:22 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWRLV-0002Yj-7k; Tue, 14 Jun 2011 10:59:46 +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 1QWRLS-0002WJ-UD; Tue, 14 Jun 2011 10:59:42 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWRKP-0002Ii-7O for linux-arm-kernel@lists.infradead.org; Tue, 14 Jun 2011 10:58:38 +0000 Received: by mail-wy0-f177.google.com with SMTP id 28so5146726wyb.36 for ; Tue, 14 Jun 2011 03:58:36 -0700 (PDT) Received: by 10.227.168.207 with SMTP id v15mr6312434wby.50.1308049116077; Tue, 14 Jun 2011 03:58:36 -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.35 (version=SSLv3 cipher=OTHER); Tue, 14 Jun 2011 03:58:35 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 4/5] ARM: proc-v6: Use new generic struct definition macros Date: Tue, 14 Jun 2011 11:58:24 +0100 Message-Id: <1308049105-16080-5-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_065837_456843_88BDC391 X-CRM114-Status: UNSURE ( 9.58 ) 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.177 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 11:00:22 +0000 (UTC) Signed-off-by: Dave Martin --- arch/arm/mm/proc-v6.S | 43 +++++-------------------------------------- 1 files changed, 5 insertions(+), 38 deletions(-) diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 1d2b845..d7ae4b7 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -170,11 +170,6 @@ cpu_resume_l1_flags: #endif - .type cpu_v6_name, #object -cpu_v6_name: - .asciz "ARMv6-compatible processor" - .size cpu_v6_name, . - cpu_v6_name - .align __CPUINIT @@ -237,36 +232,8 @@ __v6_setup: v6_crval: crval clear=0x01e0fb7f, mmuset=0x00c0387d, ucset=0x00c0187c - __INITDATA - - .type v6_processor_functions, #object -ENTRY(v6_processor_functions) - .word v6_early_abort - .word v6_pabort - .word cpu_v6_proc_init - .word cpu_v6_proc_fin - .word cpu_v6_reset - .word cpu_v6_do_idle - .word cpu_v6_dcache_clean_area - .word cpu_v6_switch_mm - .word cpu_v6_set_pte_ext - .word cpu_v6_suspend_size - .word cpu_v6_do_suspend - .word cpu_v6_do_resume - .size v6_processor_functions, . - v6_processor_functions - - .section ".rodata" - - .type cpu_arch_name, #object -cpu_arch_name: - .asciz "armv6" - .size cpu_arch_name, . - cpu_arch_name - - .type cpu_elf_name, #object -cpu_elf_name: - .asciz "v6" - .size cpu_elf_name, . - cpu_elf_name - .align + define_processor_functions v6, dabort=v6_early, pabort=v6, suspend=1 + define_proc_names v6, "armv6", "v6", "ARMv6-compatible processor" .section ".proc.info.init", #alloc, #execinstr @@ -292,11 +259,11 @@ __v6_proc_info: PMD_SECT_AP_WRITE | \ PMD_SECT_AP_READ b __v6_setup - .long cpu_arch_name - .long cpu_elf_name + .long v6_arch_name + .long v6_elf_name /* See also feat_v6_fixup() for HWCAP_TLS */ .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA|HWCAP_TLS - .long cpu_v6_name + .long v6_cpu_name .long v6_processor_functions .long v6wbi_tlb_fns .long v6_user_fns