Commit 3fb4a8fa authored by Scott Cheloha's avatar Scott Cheloha Committed by Michael Ellerman

powerpc/numa: 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.

Fixes: 72cdd117 ("pseries/hotplug-memory: hot-add: skip redundant LMB lookup")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarScott Cheloha <cheloha@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201105223040.3612663-1-cheloha@linux.ibm.com
parent 33fe43cf
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
struct device; struct device;
struct device_node; struct device_node;
struct drmem_lmb;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
...@@ -61,6 +62,9 @@ static inline int early_cpu_to_node(int cpu) ...@@ -61,6 +62,9 @@ static inline int early_cpu_to_node(int cpu)
*/ */
return (nid < 0) ? 0 : nid; return (nid < 0) ? 0 : nid;
} }
int of_drconf_to_nid_single(struct drmem_lmb *lmb);
#else #else
static inline int early_cpu_to_node(int cpu) { return 0; } 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) ...@@ -84,10 +88,12 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc)
return 0; return 0;
} }
#endif /* CONFIG_NUMA */ static inline int of_drconf_to_nid_single(struct drmem_lmb *lmb)
{
return first_online_node;
}
struct drmem_lmb; #endif /* CONFIG_NUMA */
int of_drconf_to_nid_single(struct drmem_lmb *lmb);
#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR) #if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
extern int find_and_online_cpu_nid(int cpu); extern int find_and_online_cpu_nid(int cpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment