From patchwork Tue Feb 25 18:16:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 3718331 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 923E9BF13A for ; Tue, 25 Feb 2014 18:17:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A6AEB201ED for ; Tue, 25 Feb 2014 18:17:24 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5E0C201EC for ; Tue, 25 Feb 2014 18:17:23 +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 1WIMZD-00050s-9H; Tue, 25 Feb 2014 18:17:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIMZB-0002nE-1g; Tue, 25 Feb 2014 18:17:17 +0000 Received: from mail-oa0-x233.google.com ([2607:f8b0:4003:c02::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIMZ7-0002mA-WB for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2014 18:17:15 +0000 Received: by mail-oa0-f51.google.com with SMTP id i7so850921oag.10 for ; Tue, 25 Feb 2014 10:16:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=mYQ/aOt9yrwPkEB8Uz0SVZfvNk6y9I/7Gj0VYWfXC/I=; b=ofRKnJV0BadAk/cRDxhQcOGmZLix5I+oQCtt14FcvFYSq7rnxaWKDdqORbzLdY1xEW 4XFfzj8zkw66GTqaffOEPvzQFY4zBHMogT6nuyQtpPPgigRDVyhwkS9qkThGD1t7SeDK IzurlpweTBI5Z9bRwqZC44+lUjZXCQDcNN6Q0fRHQKrC3sH3ixN1OwC3HTaIR9Qq97QQ cjgdRdgjeNu6mTf0b2k76m+jQm8QmBoXVaeCkY122OycaqXqGOAJoz7l8MR75DtnF2/J mtoDorrxy/lGEmczFUUFEGmxbm7t+1bf+QzUSTspLUyR3bFLal2YqvszNU6PhCfr/FDc E5qQ== X-Received: by 10.182.47.195 with SMTP id f3mr2565679obn.49.1393352210466; Tue, 25 Feb 2014 10:16:50 -0800 (PST) Received: from localhost.localdomain (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPSA id qe2sm44393249obc.1.2014.02.25.10.16.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 10:16:49 -0800 (PST) From: Rob Herring To: Russell King Subject: [PATCH] ARM: move __fixup_smp out of init section Date: Tue, 25 Feb 2014 12:16:33 -0600 Message-Id: <1393352193-31717-1-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140225_131714_124341_949B9A4D X-CRM114-Status: GOOD ( 11.04 ) X-Spam-Score: -1.8 (-) Cc: Rob Herring , linux-arm-kernel@lists.infradead.org, Arnd Bergmann 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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: Rob Herring With large kernel builds such as allyesconfig exceeding maximum relative branch offsets, the init section will be too far away to branch to directly. This causes veneers to be added by the compiler, but veneers don't work before the MMU is enabled. Fix this by moving __fixup_smp to the .head.text section as it is not very big. Signed-off-by: Rob Herring --- arch/arm/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 914616e..78e1443 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -475,7 +475,7 @@ ENDPROC(__turn_mmu_on) #ifdef CONFIG_SMP_ON_UP - __INIT + __HEAD __fixup_smp: and r3, r9, #0x000f0000 @ architecture version teq r3, #0x000f0000 @ CPU ID supported?