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: 256520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5D7E92C008A for ; Wed, 3 Jul 2013 08:54:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755474Ab3GBWyA (ORCPT ); Tue, 2 Jul 2013 18:54:00 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:59622 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755461Ab3GBWx6 (ORCPT ); Tue, 2 Jul 2013 18:53:58 -0400 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 Cc: Russell King , Will Deacon , Joseph Lo , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, Stephen Warren 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 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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 */