From patchwork Wed Mar 13 21:19:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10851825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5756B17E6 for ; Wed, 13 Mar 2019 21:19:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40AAE29CF9 for ; Wed, 13 Mar 2019 21:19:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3458029EEA; Wed, 13 Mar 2019 21:19:57 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 DE2F129CF9 for ; Wed, 13 Mar 2019 21:19:56 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=dSsASVkzrmD98mtkbCjx+fa4wbguj9zXdJuuBqmusZs=; b=s5xhEyQK9pbhZ1 0WJzClfJj5nrBcyjDPZALZjBuHSGrcVFAaKHw+634NHmGFMgp9KpD/lXIpRuMdrA7MU7HtSnygyDe cyWOQcMLsGGVRwlenESpYNUsSKpQnk5AOZhbTp/7CJlvCnmFUlvqWvdl/vY/nQbCgoMOrQo9pRqJo RIeJ4iBA1nMK1Zfb6Fr5zF57ozmHyUAZfBUN4NusgCJfsWPheoqdcxFSPSjXcfgwr/O8rrVJei636 XbdOKwUET45q7jNgKHPindKRgjxBBx0IKsjhxLXYvj63HRxI4rqr89ZefrTIpwNa5SqW35I22s0qz jEcsIddYNs4+ThfnfczQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4BHx-0000l7-Hw; Wed, 13 Mar 2019 21:19:49 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4BHu-0000kc-5j for linux-arm-kernel@lists.infradead.org; Wed, 13 Mar 2019 21:19:47 +0000 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MHWvH-1hH3Ji2Grh-00Dbj0; Wed, 13 Mar 2019 22:19:39 +0100 From: Arnd Bergmann To: arm@kernel.org, Sugaya Taichi Subject: [PATCH] ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU Date: Wed, 13 Mar 2019 22:19:16 +0100 Message-Id: <20190313211935.646291-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:SXNlNulCXyLfbw3+cDxZgf8+Ve61fMFD/kBGzv32wV3NS3KBZo3 AN7WLkc4lnMo5SL3uuaKu/fdNbVsYTtURYh1xWJD+DB0JBpqe58kcpE8ql4ruMwLjTPXIhk J6yy36IutXXCoJf/Lp5LNQ0Ci3uc4eAu/7DPcggIF62hP72NFPrPqeCtSqF86ZF4uXnI8Fb GQ3hWUvtjvOLcGNbRDyAA== X-UI-Out-Filterresults: notjunk:1;V03:K0:koQHp+Ff5cs=:EyXCijsl/sN0QymrsycCo0 cGmdLjAFCs8ei+kVtpTD4E0t+VvkY4DGk0SolvM/hUVQqMmKoMW9jgW/GyRBMiSkAKpFfTkYj opcrVXoSeA3PlQ+TAnCrfAhhJ17JrDdJBs1c41z5uE5KwtujN3xw/G/xjH7qdUbD9V8PEnQnd bHiu8abuT3yJP3yBoAgUpDh2jnLN74aEB4+Q1CrbrlYWhla+CpLRIm3Iw1gYJCxNzWiQzzRYs 32ZtvJp3wPqh2Anf0HNGHhBnLnWRwVMTIxh6DRCmL8zPG3K2Eo0qCfXv0P2ZWJAStDUNqF2Xn 6Rowqpr/uqtPdbZP4djWq0pM5RyRJEsvdbP8W0j36CQZ1e7ad2cRnu4E0TF2RuUFlmx+YSE7K Nt848T72u5+VqxkFLpaSSpF5nC/qWL4AAg54tUNlzDnadIjUjsE0Ju5nWNEu/bMw0p5FIKMh/ /xFwUdvlFSGSB0nIcpUoNm4l+eYgAUIZK1RIrM6Joy/O6h7lqEwkIMViTM4OF3hVmth9ngl2e Pnx3a4EVXTlofr8dn+qA2KXU7H0JEAjdff+5gZubSENvdQIfpe1RQO0FASGsB6hhLfnpwmONC CPTr7F2bu/nfBbOS+GaMv3EexGWlrLa6XV3jO1KdMM/gsfXGR9GGMSsEXkJmsOraPSvL0nnm6 49b9yNLea3zhHgYy87KBQqaTsFNqBMrBhu1lNnCkXcKPGFdLBH9HNdoZBXr7JXKBP+CqCydqz JBSxGEZ+blq29Ksr5Qzi2Ib7Lq+VzLdaJ4lepg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190313_141946_511155_C7BED923 X-CRM114-Status: GOOD ( 10.75 ) 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, Arnd Bergmann , linux-kernel@vger.kernel.org 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 When HOTPLUG_CPU is disabled, some fields in the smp operations are not available or needed: arch/arm/mach-milbeaut/platsmp.c:90:3: error: field designator 'cpu_die' does not refer to any field in type 'struct smp_operations' .cpu_die = m10v_cpu_die, ^ arch/arm/mach-milbeaut/platsmp.c:91:3: error: field designator 'cpu_kill' does not refer to any field in type 'struct smp_operations' .cpu_kill = m10v_cpu_kill, ^ Hide them in an #ifdef like the other platforms do. Fixes: 9fb29c734f9e ("ARM: milbeaut: Add basic support for Milbeaut m10v SoC") Signed-off-by: Arnd Bergmann --- arch/arm/mach-milbeaut/platsmp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-milbeaut/platsmp.c b/arch/arm/mach-milbeaut/platsmp.c index 591543c81399..3ea880f5fcb7 100644 --- a/arch/arm/mach-milbeaut/platsmp.c +++ b/arch/arm/mach-milbeaut/platsmp.c @@ -65,6 +65,7 @@ static void m10v_smp_init(unsigned int max_cpus) writel(KERNEL_UNBOOT_FLAG, m10v_smp_base + cpu * 4); } +#ifdef CONFIG_HOTPLUG_CPU static void m10v_cpu_die(unsigned int l_cpu) { gic_cpu_if_down(0); @@ -83,12 +84,15 @@ static int m10v_cpu_kill(unsigned int l_cpu) return 1; } +#endif static struct smp_operations m10v_smp_ops __initdata = { .smp_prepare_cpus = m10v_smp_init, .smp_boot_secondary = m10v_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU .cpu_die = m10v_cpu_die, .cpu_kill = m10v_cpu_kill, +#endif }; CPU_METHOD_OF_DECLARE(m10v_smp, "socionext,milbeaut-m10v-smp", &m10v_smp_ops);