powerpc: topology.h: fix build when CONFIG_NUMA=n
PATCH v2 1/1 powerpc: topology.h: fix build when CONFIG_NUMA=n
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.
---
v1: Initial patch.
v2: Incorporate suggested cleanups from Christophe Leroy.
arch/powerpc/include/asm/topology.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/topology.h +9 -3
@@ -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);
Signature · 1 line
2.28.0
Le 05/11/2020 à 23:30, Scott Cheloha a écrit :
Quoted 7 lines
Add a non-NUMA definition for
of_drconf_to_nid_single()totopology.hso we have one even ifpowerpc/mm/numa.cis not compiled. On a non-NUMA kernel the appropriate node id is alwaysfirst_online_node.Signed-off-by Scott Cheloha <[email protected]>Reported-by kernel test robot <[email protected]>Fixes 72cdd117c449 ("pseries/hotplug-memory: hot-add: skip redundant LMB lookup")
Quoted 47 lines
---
v1: Initial patch.v2: Incorporate suggested cleanups from Christophe Leroy.
arch/powerpc/include/asm/topology.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)arch/powerpc/include/asm/topology.h +9
-3@@ -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);
Michael Ellerman
AppliedQuoted 3 lines · Scott Cheloha
Add a non-NUMA definition for
of_drconf_to_nid_single()totopology.hso we have one even ifpowerpc/mm/numa.cis not compiled. On a non-NUMA kernel the appropriate node id is alwaysfirst_online_node.
Applied to powerpc/fixes.
[1/1] powerpc/numa: Fix build when CONFIG_NUMA=n
https://git.kernel.org/powerpc/c/3fb4a8fa28b740709bdd3229b80279957f4d37ed
cheers