| Message ID | 20201105162018.3559108-1-cheloha@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | powerpc: topology.h: fix build when CONFIG_NUMA=n | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (58b9041431fcf9f3f87c8def87ca82dd54cf80dd) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 0 warnings, 1 checks, 26 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch fixes a commit that hasn't been released yet |
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 <cheloha@linux.ibm.com> > Reported-by: kernel test robot <lkp@intel.com> > 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
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; +extern 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; -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);
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 <cheloha@linux.ibm.com> Reported-by: kernel test robot <lkp@intel.com> 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(-)