From patchwork Thu Oct 5 12:09:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9986979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B24A602B8 for ; Thu, 5 Oct 2017 12:10:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74A7628C2A for ; Thu, 5 Oct 2017 12:10:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6862928C70; Thu, 5 Oct 2017 12:10:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D67B028709 for ; Thu, 5 Oct 2017 12:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=LrrWjgCd5bB9GoTd8zC9G0WhCgY2dlxzFtBLZl8pyAE=; b=JnN 76Yeb7Q4wnIny0A1HYZzP6e0Lt+9lSzOBF++1F+cTGXdLP24AYeV5paFJ16/n1ZsBDWbP06m5jRC8 u6polfNIdC8IMhQ6A4dR2acw0XU/1ZlILtC6V5IdwycPMhoO40i6I/+a3v3vQiRhNQDlDtGm8aeLN Oa106CUi5mYTzyLBCvJkXjEahuR+qo6CaLQCl+8plYbWfpp0d/6FndtGGIBkXNvrwHwd1sdYpkV5Z PuT+7RnYCjI9qNA4n/QIAMPhumh90MWNUohxZZfRzSHcNs30i96jY+iIGPSiVjWp8HXlxlgy6uOiA TyNcihPD33oJGd2EYL7booHFb2T1J7Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e04yQ-0002cM-Nz; Thu, 05 Oct 2017 12:09:54 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e04yM-0002Zq-Ph for linux-arm-kernel@lists.infradead.org; Thu, 05 Oct 2017 12:09:52 +0000 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0M40t0-1d8wLX1nrm-00rc1m; Thu, 05 Oct 2017 14:09:17 +0200 From: Arnd Bergmann To: Simon Horman , Magnus Damm Subject: [PATCH] ARM: shmobile: rcar-gen2: fix non-SMP build Date: Thu, 5 Oct 2017 14:09:04 +0200 Message-Id: <20171005120914.465582-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:fXLUI+9pCB6A8++5S3LIFF+oGQypHD0qLSaheb/mDmNTD1AedOb OtOcFTxzIJTwAi/88d1ooQ3rrSWVV3nRGzhQiH9SFH59vg9S1RDhu/c3bNdhskr6mWrt5Aj yRCFMx6txmCXLGAz87guccgGOHwysdIlY/AlJdcxMqLAL0PkkLKAXv7DcWFCQXKWecqtu5W mawBXH9BCymvqspLKBETw== X-UI-Out-Filterresults: notjunk:1; V01:K0:lM3PFXczgz8=:sQS+yI/Bs4KeSPEBG2NGD+ J6YII1bExBjo12qFUN+a/SLoXDNGNHgqC5G88jIIv7UF4kQ6uDy3tWr4C1lecPc27fOI/4eZ8 jCXc5exn5o/57rfdyi5jE7MQiTRxniM7brxyFwhpzFGWrADN/8YI6m5WeNQR+u662pEYUEOKN X3Wyr8CjSSMa4UDNGsb3dyJTlrvaelY8V75Agg/tGNhGrhaNNh78WF0OudXk5V4WsRny9We6H GcaKnESyWKb0dcO/is1qSDvdY5b26q1RiP7chHlRalOQfRX0jLx6qdKK8ljpqHTRmU9wpqqOH 1hVfWWDg46Nbzy5zdFQYohjwCV5/KoTG+wsqbSJb53oqVzj3mmGSBSyCR7V0V/zDsB4FL/Jra 4uLoVxAAFB8nSSpA4rCTbCXN+LCFrpv93pDHCQlRcnZnNVVGmsaTJmHAjvf+EdwHtynOQ67lf /WajgRRL02fAfrtVzl8lN42STaPRqqNEbLkSyyoYKtrytRpQNdUleVHIFSBgBFDJSbA0Ykg5x mSM3S2/jO7mLr+hB/AgA7wU3dCijr4y0drr5kvp4vIJKODk5vvR2KqZZfXcUlApqnhRIQe3C0 Y3bTA4AWBW9SbBpgxlPpm2B6Lrz4NqehP5MN3dtI+SX0K3QMIWSFNbqjw7CnyGFnJFIWHcsyQ yIVvljHtIO/2hw2iHLEgSj94FJOZtX3zZiyMkLa/3ywcAbVvFytW0fMNu+7uQX7RHhssX79+Y 0RuSK/uYzZNVQ4a4V8TTBEdnRttZ8c6lsisRJA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171005_050951_172096_60948FB8 X-CRM114-Status: GOOD ( 10.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven , Arnd Bergmann , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP A bugfix for the SMP case broke the build for the UP case: arch/arm/mach-shmobile/headsmp-apmu.o: In function `shmobile_boot_apmu': (.text+0x34): undefined reference to `secondary_startup' The assembler file mixes code that is used for SMP with code that we also need on a single-CPU build, so I'm leaving it always enabled in the Makefile, but enclose the SMP code in an #ifdef. 3fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15") Signed-off-by: Arnd Bergmann Signed-off-by: Arnd Bergmann Acked-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven ;-) --- arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S index db4743d2bf91..5672b5849401 100644 --- a/arch/arm/mach-shmobile/headsmp-apmu.S +++ b/arch/arm/mach-shmobile/headsmp-apmu.S @@ -31,7 +31,9 @@ ENTRY(shmobile_init_cntvoff) ret lr ENDPROC(shmobile_init_cntvoff) +#ifdef CONFIG_SMP ENTRY(shmobile_boot_apmu) bl shmobile_init_cntvoff b secondary_startup ENDPROC(shmobile_boot_apmu) +#endif