Re: [PATCH v2] powerpc: topology.h: fix build when CONFIG_NUMA=n

[Christophe Leroy]

Le 05/11/2020 à 23:30, 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 <chel...@linux.ibm.com>
Reported-by: kernel test robot <l...@intel.com>
Fixes: 72cdd117c449 ("pseries/hotplug-memory: hot-add: skip redundant LMB 
lookup")

Reviewed-by: Christophe Leroy <christophe.le...@csgroup.eu>

---
v1: Initial patch.

v2: Incorporate suggested cleanups from Christophe Leroy.

  arch/powerpc/include/asm/topology.h | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/include/asm/topology.h 
b/arch/powerpc/include/asm/topology.h
index 8728590f514a..3beeb030cd78 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -6,6 +6,7 @@

struct device;

  struct device_node;
+struct drmem_lmb;

#ifdef CONFIG_NUMA @@ -61,6 +62,9 @@ static inline int early_cpu_to_node(int cpu)

         */
        return (nid < 0) ? 0 : nid;
  }
+
+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,12 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 
*cpu2_assoc)
        return 0;
  }

-#endif /* CONFIG_NUMA */

+static inline int of_drconf_to_nid_single(struct drmem_lmb *lmb)
+{
+       return first_online_node;
+}

-struct drmem_lmb;

-int of_drconf_to_nid_single(struct drmem_lmb *lmb);
+#endif /* CONFIG_NUMA */

#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)

  extern int find_and_online_cpu_nid(int cpu);