]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/pseries: Fix build error when NUMA=n
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 16 Aug 2021 02:30:11 +0000 (12:30 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 16 Aug 2021 04:11:00 +0000 (14:11 +1000)
As reported by lkp, if NUMA=n we see a build error:

   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
    1022 |        node_to_cpumask_map[node]);

Use cpumask_of_node() which has an empty stub for NUMA=n, and when
NUMA=y does a lookup from node_to_cpumask_map[].

Fixes: ec95f6616bcc ("powerpc/pseries: Prevent free CPU ids being reused on another node")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210816041032.2839343-1-mpe@ellerman.id.au
arch/powerpc/platforms/pseries/hotplug-cpu.c

index 1ef40ef699a6418e56e9862dbfa57b294f914983..d646c22e94abb9dc4c688e856156470df089e689 100644 (file)
@@ -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);