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: 160281 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14770656jad; Wed, 13 Mar 2019 14:19:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIfJf+T/xOsc3tJo/LvbZxZ+J0anPYjTUVo1J3B/0hB3Q45LDYmCy9sBJjyVZCm2+VCkVe X-Received: by 2002:a65:47cb:: with SMTP id f11mr25043904pgs.18.1552511993883; Wed, 13 Mar 2019 14:19:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552511993; cv=none; d=google.com; s=arc-20160816; b=QooJJy8spFBViWLof2/i4PVQgW/9ugjsVg4/U13grYyLo0C2NmeoEUvxir1eHwakBa eLl02QoVnTXfIqXxhhDKvO8tqeBLuDoL0KlmAipVbr4LiGoNLA9Sqji936k5chYV+4B8 nV+9jVLfBj3Mk1R2dJOi8UCgPx1cwOn8SJLFc6zUBvnJUJNWOM7A4jFSkaq7QDbzmgKo 9cNO25ZG/rKPso3HwrBoG/c53KPxQk1zGwy14JntIfgO7oPl9F77KGzfGNvlY2w0nd+j gYhKJ/gnTWfEHyAbu8cO7iRwMWljfF5681YXBCNAi4xr2nPBtzGf55AKlDbCMh2gqzq1 J79A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=wxTldz+SJy1vRCRDZ56Ay93f1TLjZSoaP/aBFQP/S3I=; b=dsratQWHwcW+UPVr7DmM7kVM8c4On4ky61OkYhoSiclkiW7MT3a8VRxkGDqFUZ6E1N jMqU5zrZYA1y3F+rTJgzKcG95Sf48fQ1t8xEGPX+iGXPMQUS69vy/B0ZsenA2bJIaSZo gx4vjMvQtW20zG8hVlmQh8lCObYUeb91gOe//29crcqugdcj507N9LbeFNx8QKe+huew PW+LSEvYQ52puq0rtpT5+xDx2ceSEeumwJNgV9ysSN2JMqnmZPVpkR7HkjoPTBrV/k+k oPXzcuelVTsNT9UkshWvA9PSRESLDvrpZKeGCPW+eB+ci1rdFba1j4XkmnAp6IPqxCGF APNQ== 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 i65si12534263pfb.118.2019.03.13.14.19.53; Wed, 13 Mar 2019 14:19:53 -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 S1727691AbfCMVTw (ORCPT + 31 others); Wed, 13 Mar 2019 17:19:52 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:39541 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727392AbfCMVTv (ORCPT ); Wed, 13 Mar 2019 17:19:51 -0400 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 Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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-Spam-Flag: NO 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.20.0 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);