diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/numa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index b037d95eeadc..64c00227b997 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -451,7 +451,7 @@ static int __cpuinit numa_setup_cpu(unsigned long lcpu) | |||
451 | nid = of_node_to_nid_single(cpu); | 451 | nid = of_node_to_nid_single(cpu); |
452 | 452 | ||
453 | if (nid < 0 || !node_online(nid)) | 453 | if (nid < 0 || !node_online(nid)) |
454 | nid = any_online_node(NODE_MASK_ALL); | 454 | nid = first_online_node; |
455 | out: | 455 | out: |
456 | map_cpu_to_node(lcpu, nid); | 456 | map_cpu_to_node(lcpu, nid); |
457 | 457 | ||
@@ -1114,7 +1114,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr) | |||
1114 | int nid, found = 0; | 1114 | int nid, found = 0; |
1115 | 1115 | ||
1116 | if (!numa_enabled || (min_common_depth < 0)) | 1116 | if (!numa_enabled || (min_common_depth < 0)) |
1117 | return any_online_node(NODE_MASK_ALL); | 1117 | return first_online_node; |
1118 | 1118 | ||
1119 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); | 1119 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); |
1120 | if (memory) { | 1120 | if (memory) { |
@@ -1125,7 +1125,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr) | |||
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | if (nid < 0 || !node_online(nid)) | 1127 | if (nid < 0 || !node_online(nid)) |
1128 | nid = any_online_node(NODE_MASK_ALL); | 1128 | nid = first_online_node; |
1129 | 1129 | ||
1130 | if (NODE_DATA(nid)->node_spanned_pages) | 1130 | if (NODE_DATA(nid)->node_spanned_pages) |
1131 | return nid; | 1131 | return nid; |