Add argument to allow caller to determine whether the node identified for a cpu after an associativity / affinity change should be inited.
Signed-off-by: Michael Bringmann <m...@linux.vnet.ibm.com> --- arch/powerpc/include/asm/topology.h | 2 +- arch/powerpc/mm/numa.c | 6 +++--- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index a4a718d..4621f40 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h @@ -90,7 +90,7 @@ static inline void update_numa_cpu_lookup_table(unsigned int cpu, int node) {} extern int start_topology_update(void); extern int stop_topology_update(void); extern int prrn_is_enabled(void); -extern int find_and_online_cpu_nid(int cpu); +extern int find_and_online_cpu_nid(int cpu, bool must_online); extern int timed_topology_update(int nsecs); extern void __init shared_proc_topology_init(void); #else diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 3a048e9..460d60f 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1197,7 +1197,7 @@ static long vphn_get_associativity(unsigned long cpu, return rc; } -int find_and_online_cpu_nid(int cpu) +int find_and_online_cpu_nid(int cpu, bool must_online) { __be32 associativity[VPHN_ASSOC_BUFSIZE] = {0}; int new_nid; @@ -1210,7 +1210,7 @@ int find_and_online_cpu_nid(int cpu) if (new_nid < 0 || !node_possible(new_nid)) new_nid = first_online_node; - if (NODE_DATA(new_nid) == NULL) { + if (must_online && (NODE_DATA(new_nid) == NULL)) { #ifdef CONFIG_MEMORY_HOTPLUG /* * Need to ensure that NODE_DATA is initialized for a node from @@ -1337,7 +1337,7 @@ int numa_update_cpu_topology(bool cpus_locked) continue; } - new_nid = find_and_online_cpu_nid(cpu); + new_nid = find_and_online_cpu_nid(cpu, true); if (new_nid == numa_cpu_lookup_table[cpu]) { cpumask_andnot(&cpu_associativity_changes_mask, diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 2f8e621..620cb57 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -366,7 +366,7 @@ static int dlpar_online_cpu(struct device_node *dn) != CPU_STATE_OFFLINE); cpu_maps_update_done(); timed_topology_update(1); - find_and_online_cpu_nid(cpu); + find_and_online_cpu_nid(cpu, true); rc = device_online(get_cpu_device(cpu)); if (rc) goto out;