From patchwork Fri Feb 12 19:06:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8296181 Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 54D2B9F372 for ; Fri, 12 Feb 2016 19:07:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7FC020225 for ; Fri, 12 Feb 2016 19:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BFB820452 for ; Fri, 12 Feb 2016 19:07:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751153AbcBLTHw (ORCPT ); Fri, 12 Feb 2016 14:07:52 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:41775 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750995AbcBLTHw (ORCPT ); Fri, 12 Feb 2016 14:07:52 -0500 Received: from penelope.kanocho.kobe.vergenet.net (128-47-71-217.dyn.estpak.ee [217.71.47.128]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 9A22125BEF9; Sat, 13 Feb 2016 06:06:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1455304015; bh=s6zEMHaMcSCrq9nMpSg0ShSvNUpZ086WO59meWKI/N8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e+BtKQ3oT2zsaAdKhonWqha4VC5Kwu+4wtWfaL+e8dilpRvB6LeZRuY/Bgc579NYk 9z7MDOC+kbk/5q+NMeDXgFBZlA8z5nVXvsviWseKn0r4OevS6TpIOR91vnSvNqnYgT E9Vd3rbTQNWRG8EDvLBFRUjOqwcB5KE4YNkTxg8o= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 48DD2604CB; Sat, 13 Feb 2016 06:06:27 +1100 (AEDT) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Geert Uytterhoeven , Simon Horman Subject: [PATCH 4/8] ARM: shmobile: Move shmobile_scu_base from .text to .data Date: Fri, 12 Feb 2016 20:06:22 +0100 Message-Id: <797eff54b22b76d9f356074ff3c7ed25d9742e54.1455303757.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: References: Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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: Geert Uytterhoeven shmobile_scu_base is being written to, so it doesn't belong in the .text section. Fix this by moving it from asm .text to C .data, as it's no longer used from asm code since commit 4f6da36f7edd5790 ("ARM: shmobile: Remove old SCU boot code"). Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/headsmp-scu.S | 6 ------ arch/arm/mach-shmobile/platsmp-scu.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index c0008a5aa4ca..936d7011c314 100644 --- a/arch/arm/mach-shmobile/headsmp-scu.S +++ b/arch/arm/mach-shmobile/headsmp-scu.S @@ -38,9 +38,3 @@ ENTRY(shmobile_boot_scu) b secondary_startup ENDPROC(shmobile_boot_scu) - - .text - .align 2 - .globl shmobile_scu_base -shmobile_scu_base: - .space 4 diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c index 64663110ab6c..f2198c9c7435 100644 --- a/arch/arm/mach-shmobile/platsmp-scu.c +++ b/arch/arm/mach-shmobile/platsmp-scu.c @@ -17,6 +17,9 @@ #include #include "common.h" + +void __iomem *shmobile_scu_base; + static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb, unsigned long action, void *hcpu) {