Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965064Ab3GESTU (ORCPT ); Fri, 5 Jul 2013 14:19:20 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:41642 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752249Ab3GESTT (ORCPT ); Fri, 5 Jul 2013 14:19:19 -0400 From: Stephen Warren To: Russell King Cc: Paul Gortmaker , Will Deacon , Joseph Lo , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, Stephen Warren Subject: [PATCH V3] ARM: add missing linker section markup to head-common.S Date: Fri, 5 Jul 2013 12:10:55 -0600 Message-Id: <1373047855-24145-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 X-NVConfidentiality: public Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1876 Lines: 48 From: Stephen Warren Macro __INIT is used to place various code in head-common.S into the init section. This should be matched by a closing __FINIT. Also, add an explicit ".text" to ensure subsequent code is placed into the correct section; __FINIT is simply a closing marker to match __INIT and doesn't guarantee to revert to .text. This historically caused no problem, because macro __CPUINIT was used at the exact location where __FINIT was missing, which then placed following code into the cpuinit section. However, with commit 22f0a2736 "init.h: remove __cpuinit sections from the kernel" applied, __CPUINIT becomes a no-op, thus leaving all this code in the init section, rather than the regular text section. This caused issues such as secondary CPU boot failures or crashes. Signed-off-by: Stephen Warren Acked-by: Paul Gortmaker --- v3: Added .text after __FINIT to force the correct section. v2: Moved __FINIT after lookup_processor_type, to correctly match the location of __CPUINIT. --- arch/arm/kernel/head-common.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index 529ce99..47cd974 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -133,6 +133,9 @@ ENTRY(lookup_processor_type) ldmfd sp!, {r4 - r6, r9, pc} ENDPROC(lookup_processor_type) + __FINIT + .text + /* * Read processor ID register (CP#15, CR0), and look up in the linker-built * supported processor list. Note that we can't use the absolute addresses -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/