aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/mm/numa.c4
-rw-r--r--arch/powerpc/platforms/pseries/hotplug-cpu.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 1bead2c67272..314d19ab9385 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1198,7 +1198,7 @@ static long vphn_get_associativity(unsigned long cpu,
1198 return rc; 1198 return rc;
1199} 1199}
1200 1200
1201static inline int find_and_online_cpu_nid(int cpu) 1201int find_and_online_cpu_nid(int cpu)
1202{ 1202{
1203 __be32 associativity[VPHN_ASSOC_BUFSIZE] = {0}; 1203 __be32 associativity[VPHN_ASSOC_BUFSIZE] = {0};
1204 int new_nid; 1204 int new_nid;
@@ -1229,6 +1229,8 @@ static inline int find_and_online_cpu_nid(int cpu)
1229#endif 1229#endif
1230 } 1230 }
1231 1231
1232 pr_debug("%s:%d cpu %d nid %d\n", __FUNCTION__, __LINE__,
1233 cpu, new_nid);
1232 return new_nid; 1234 return new_nid;
1233} 1235}
1234 1236
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index a7d14aa7bb7c..dceb51454d8d 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -340,6 +340,8 @@ static void pseries_remove_processor(struct device_node *np)
340 cpu_maps_update_done(); 340 cpu_maps_update_done();
341} 341}
342 342
343extern int find_and_online_cpu_nid(int cpu);
344
343static int dlpar_online_cpu(struct device_node *dn) 345static int dlpar_online_cpu(struct device_node *dn)
344{ 346{
345 int rc = 0; 347 int rc = 0;
@@ -364,6 +366,7 @@ static int dlpar_online_cpu(struct device_node *dn)
364 != CPU_STATE_OFFLINE); 366 != CPU_STATE_OFFLINE);
365 cpu_maps_update_done(); 367 cpu_maps_update_done();
366 timed_topology_update(1); 368 timed_topology_update(1);
369 find_and_online_cpu_nid(cpu);
367 rc = device_online(get_cpu_device(cpu)); 370 rc = device_online(get_cpu_device(cpu));
368 if (rc) 371 if (rc)
369 goto out; 372 goto out;