From patchwork Tue Jul 2 22:53:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 2814841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5A250BF4A1 for ; Tue, 2 Jul 2013 22:54:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 804D820137 for ; Tue, 2 Jul 2013 22:54:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A22020134 for ; Tue, 2 Jul 2013 22:54:38 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uu9Sq-0000w4-Bq; Tue, 02 Jul 2013 22:54:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uu9Sn-0004sM-Tw; Tue, 02 Jul 2013 22:54:21 +0000 Received: from avon.wwwdotorg.org ([2001:470:1f0f:bd7::2]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uu9Sl-0004rX-Qh for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2013 22:54:20 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id E18CF6446; Tue, 2 Jul 2013 17:04:41 -0600 (MDT) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id C8877E40EB; Tue, 2 Jul 2013 16:53:55 -0600 (MDT) From: Stephen Warren To: Paul Gortmaker Subject: [PATCH] ARM: move body of head-common.S back to text section Date: Tue, 2 Jul 2013 16:53:49 -0600 Message-Id: <1372805629-18382-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.7 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130702_185419_938441_3FAC0424 X-CRM114-Status: GOOD ( 11.89 ) X-Spam-Score: -1.9 (-) Cc: Russell King , Will Deacon , linux-kernel@vger.kernel.org, Joseph Lo , linux-tegra@vger.kernel.org, Stephen Warren , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Stephen Warren Commit 281ecb7 "arm: delete __cpuinit/__CPUINIT usage from all ARM users" removed a __CPUINIT from head-common.S. However, the code immediately before the removed tag was marked __INIT, and was missing a match __FINIT. This caused code after the removed __CPUINIT to end up in the init section rather than the main text section as desired. This caused issues such as secondary CPU boot failures or crashes. Add the missing __FINIT to solve this. Signed-off-by: Stephen Warren --- arch/arm/kernel/head-common.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index 529ce99..a9dc804 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -122,6 +122,8 @@ __mmap_switched_data: .long init_thread_union + THREAD_START_SP @ sp .size __mmap_switched_data, . - __mmap_switched_data + __FINIT + /* * This provides a C-API version of __lookup_processor_type */