| Message ID | 20210816151705.2786296-1-nathanl@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/pseries/cpuhp: fix non-NUMA build | expand |
Le 16/08/2021 à 17:17, Nathan Lynch a écrit : > With CONFIG_NUMA unset, direct references to node_to_cpumask_map don't > work: > > arch/powerpc/platforms/pseries/hotplug-cpu.c: In function 'pseries_cpu_hotplug_init': >>> arch/powerpc/platforms/pseries/hotplug-cpu.c:1022:8: error: 'node_to_cpumask_map' undeclared (first use in this >>> function) > 1022 | node_to_cpumask_map[node]); > | ^~~~~~~~~~~~~~~~~~~ > > Use cpumask_of_node() here instead. Isn't it the same as https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210816041032.2839343-1-mpe@ellerman.id.au/ ? Christophe > > Fixes: bd1dd4c5f528 ("powerpc/pseries: Prevent free CPU ids being reused on another node") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> > --- > arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c > index 1ef40ef699a6..d646c22e94ab 100644 > --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c > +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c > @@ -1021,7 +1021,7 @@ static int __init pseries_cpu_hotplug_init(void) > /* Record ids of CPU added at boot time */ > cpumask_or(node_recorded_ids_map[node], > node_recorded_ids_map[node], > - node_to_cpumask_map[node]); > + cpumask_of_node(node)); > } > > of_reconfig_notifier_register(&pseries_smp_nb); >
Christophe Leroy <christophe.leroy@csgroup.eu> writes: > Le 16/08/2021 à 17:17, Nathan Lynch a écrit : >> With CONFIG_NUMA unset, direct references to node_to_cpumask_map don't >> work: >> >> arch/powerpc/platforms/pseries/hotplug-cpu.c: In function 'pseries_cpu_hotplug_init': >>>> arch/powerpc/platforms/pseries/hotplug-cpu.c:1022:8: error: 'node_to_cpumask_map' undeclared (first use in this >>>> function) >> 1022 | node_to_cpumask_map[node]); >> | ^~~~~~~~~~~~~~~~~~~ >> >> Use cpumask_of_node() here instead. > > > Isn't it the same as > https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210816041032.2839343-1-mpe@ellerman.id.au/ ? Yes, thanks.
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 1ef40ef699a6..d646c22e94ab 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -1021,7 +1021,7 @@ static int __init pseries_cpu_hotplug_init(void) /* Record ids of CPU added at boot time */ cpumask_or(node_recorded_ids_map[node], node_recorded_ids_map[node], - node_to_cpumask_map[node]); + cpumask_of_node(node)); } of_reconfig_notifier_register(&pseries_smp_nb);