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: 114928 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp515790qgn; Thu, 5 Oct 2017 05:10:10 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB9JUh0ny66P8MwuL77rrFnmRzocgtttoywJ3mpCNGK/SzYAF7cmJcz4IDk2COMsFf6crgp X-Received: by 10.84.185.106 with SMTP id e39mr22294569plg.333.1507205410139; Thu, 05 Oct 2017 05:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507205410; cv=none; d=google.com; s=arc-20160816; b=xcjjglzx8vCbWJ/n3/8hfOeWKka3C5rIom5XJL+61YjVIpA41jcO6WkCsNLcRehRTr kJCo0u+b19x918aBNaRhBXNR7216rNyAVrxyn4XMWKbxcGKIP2iJhVGY4EgHu5kssIF2 Me7BOv9k+saj81sVqTT4poHu3Up+EvgszeGpnVxt2f+c59OgcKlXYH5Sd8RcfPSZBTTV nUF3EPJAxiv01hfoyjp85W2djCq6J1vNN4TkeqFVsFY+9aIxTL6bZoKSjoIofUtzvfDW /zgKoxqofgDAXbsK8q1YC9LYbQhh5HqB9q+r4Up8SXM7DJ+Lwf5yggxWhEv7wuJV9Qai cDHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=lfMsvYFK7JF1BJfEMrPGjqyERb+XllRA6CbPJbQ1V9I=; b=Mt3AZJFqsNNVg011zdmb/I5RsmT0FWoOqlb+CjqUWIQw7zyHOF1SQmpMWTbXSc+RJ5 b7oo1PrpKoXkJALcT0HiN6I1Y/LTN7/bT3v1QxHDnvBJKhoxbH4sYFfaM8m2HHgp4C/a HSHBFk2oUW5Px/XBZWvcHg8IGtgcolpP/gkLjcAAUbWdA7S40lSPjdqL0mitFLBUtjoY nE6n3nDTdBsAu+WaKEJ2suLwvfuq3M5nF/ts4drX7SNyda7BbG9L+0I9lQfV+sHNDX4v WlhgGGbb2+gE113PQtSzdDk4By8jv4A2CP87JyeEeChBuFgXkYG6PTTipggyOcN0DxBw oQCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z11si13638487plo.129.2017.10.05.05.09.58; Thu, 05 Oct 2017 05:10:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444AbdJEMJ4 (ORCPT + 26 others); Thu, 5 Oct 2017 08:09:56 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:54885 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751248AbdJEMJy (ORCPT ); Thu, 5 Oct 2017 08:09:54 -0400 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 Cc: Arnd Bergmann , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 Acked-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven ;-) 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