From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 943B8C55179 for ; Thu, 5 Nov 2020 17:39:39 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F884206CA for ; Thu, 5 Nov 2020 17:39:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F884206CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CRrPM2VV6zDr3b for ; Fri, 6 Nov 2020 04:39:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CRrMR3z6BzDr2g for ; Fri, 6 Nov 2020 04:37:40 +1100 (AEDT) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4CRrLy3VmQzB09bR; Thu, 5 Nov 2020 18:37:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id ZyufDVRjDfXh; Thu, 5 Nov 2020 18:37:30 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4CRrLy2DytzB09bQ; Thu, 5 Nov 2020 18:37:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1F7D08B861; Thu, 5 Nov 2020 18:37:32 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id QwaUA1tnrZCz; Thu, 5 Nov 2020 18:37:32 +0100 (CET) Received: from [192.168.4.90] (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 403928B84C; Thu, 5 Nov 2020 18:37:31 +0100 (CET) Subject: Re: [PATCH] powerpc: topology.h: fix build when CONFIG_NUMA=n To: Scott Cheloha , linuxppc-dev@lists.ozlabs.org References: <20201105162018.3559108-1-cheloha@linux.ibm.com> From: Christophe Leroy Message-ID: Date: Thu, 5 Nov 2020 18:34:39 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <20201105162018.3559108-1-cheloha@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nathan Lynch , Laurent Dufour , kernel test robot Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Le 05/11/2020 à 17:20, Scott Cheloha a écrit : > Add a non-NUMA definition for of_drconf_to_nid_single() to topology.h > so we have one even if powerpc/mm/numa.c is not compiled. On a non-NUMA > kernel the appropriate node id is always first_online_node. > > Signed-off-by: Scott Cheloha > Reported-by: kernel test robot > Fixes: 72cdd117c449 ("pseries/hotplug-memory: hot-add: skip redundant LMB lookup") > --- > arch/powerpc/include/asm/topology.h | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h > index 8728590f514a..90d2424418b5 100644 > --- a/arch/powerpc/include/asm/topology.h > +++ b/arch/powerpc/include/asm/topology.h > @@ -61,6 +61,10 @@ static inline int early_cpu_to_node(int cpu) > */ > return (nid < 0) ? 0 : nid; > } > + > +struct drmem_lmb; Can you put that before the #ifdef CONFIG_NUMA in order to avoid duplicating it ? > +extern int of_drconf_to_nid_single(struct drmem_lmb *lmb); 'extern' keywork is useless on a function prototype, don't add one, keep the prototype as before, ie: int of_drconf_to_nid_single(struct drmem_lmb *lmb); > + > #else > > static inline int early_cpu_to_node(int cpu) { return 0; } > @@ -84,10 +88,13 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc) > return 0; > } > > -#endif /* CONFIG_NUMA */ > - > struct drmem_lmb; Can you put that before the #ifdef CONFIG_NUMA in order to avoid duplicating it ? > -int of_drconf_to_nid_single(struct drmem_lmb *lmb); > +static inline int of_drconf_to_nid_single(struct drmem_lmb *lmb) > +{ > + return first_online_node; > +} > + > +#endif /* CONFIG_NUMA */ > > #if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR) > extern int find_and_online_cpu_nid(int cpu); > Christophe