From patchwork Wed Oct 11 07:46:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9998877 X-Patchwork-Delegate: horms@verge.net.au 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 DBC656037F for ; Wed, 11 Oct 2017 07:47:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBF3328901 for ; Wed, 11 Oct 2017 07:47:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEF3A2891C; Wed, 11 Oct 2017 07:47:34 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1414128901 for ; Wed, 11 Oct 2017 07:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755556AbdJKHrd (ORCPT ); Wed, 11 Oct 2017 03:47:33 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:33617 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbdJKHrd (ORCPT ); Wed, 11 Oct 2017 03:47:33 -0400 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id DCE0025B739; Wed, 11 Oct 2017 18:47:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1507708052; bh=4ANF3/beXRBMvr8IaekCrp9iOf5D2u2rgr6QPGkkL9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWab3A6QibE2Ypgdx7z/YexKtE64utdPkhM21WKeeHSAgPCk3kpcnDhsY7fVHmnBW ExhohGY6o8yf+5nPyzZqyF7aCkePZNN1Vk+KqtUPUMfHuUp20REZMF7hTYjkcHSEcC sAAMCbW1Vn12etyTpq3y1sMle/y8lwf5MTDUnEF0= Received: by penelope.horms.nl (Postfix, from userid 7100) id CDBCFE20AC1; Wed, 11 Oct 2017 09:46:50 +0200 (CEST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Arnd Bergmann , Simon Horman Subject: [PATCH 1/1] ARM: shmobile: rcar-gen2: fix non-SMP build Date: Wed, 11 Oct 2017 09:46:49 +0200 Message-Id: <703ef76b8fd5169d5cff30de5b958d6728b9a147.1507707869.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.11.0 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-Virus-Scanned: ClamAV using ClamSMTP From: Arnd Bergmann 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. Fixes: fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15") Signed-off-by: Arnd Bergmann Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- 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