diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e60e41474332..0c9f406e3c44 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -161,7 +161,9 @@ static unsigned long __meminitdata dma_reserve; | |||
161 | 161 | ||
162 | #if MAX_NUMNODES > 1 | 162 | #if MAX_NUMNODES > 1 |
163 | int nr_node_ids __read_mostly = MAX_NUMNODES; | 163 | int nr_node_ids __read_mostly = MAX_NUMNODES; |
164 | int nr_online_nodes __read_mostly = 1; | ||
164 | EXPORT_SYMBOL(nr_node_ids); | 165 | EXPORT_SYMBOL(nr_node_ids); |
166 | EXPORT_SYMBOL(nr_online_nodes); | ||
165 | #endif | 167 | #endif |
166 | 168 | ||
167 | int page_group_by_mobility_disabled __read_mostly; | 169 | int page_group_by_mobility_disabled __read_mostly; |
@@ -1466,7 +1468,7 @@ this_zone_full: | |||
1466 | if (NUMA_BUILD) | 1468 | if (NUMA_BUILD) |
1467 | zlc_mark_zone_full(zonelist, z); | 1469 | zlc_mark_zone_full(zonelist, z); |
1468 | try_next_zone: | 1470 | try_next_zone: |
1469 | if (NUMA_BUILD && !did_zlc_setup && num_online_nodes() > 1) { | 1471 | if (NUMA_BUILD && !did_zlc_setup && nr_online_nodes > 1) { |
1470 | /* | 1472 | /* |
1471 | * we do zlc_setup after the first zone is tried but only | 1473 | * we do zlc_setup after the first zone is tried but only |
1472 | * if there are multiple nodes make it worthwhile | 1474 | * if there are multiple nodes make it worthwhile |
@@ -2265,7 +2267,7 @@ int numa_zonelist_order_handler(ctl_table *table, int write, | |||
2265 | } | 2267 | } |
2266 | 2268 | ||
2267 | 2269 | ||
2268 | #define MAX_NODE_LOAD (num_online_nodes()) | 2270 | #define MAX_NODE_LOAD (nr_online_nodes) |
2269 | static int node_load[MAX_NUMNODES]; | 2271 | static int node_load[MAX_NUMNODES]; |
2270 | 2272 | ||
2271 | /** | 2273 | /** |
@@ -2474,7 +2476,7 @@ static void build_zonelists(pg_data_t *pgdat) | |||
2474 | 2476 | ||
2475 | /* NUMA-aware ordering of nodes */ | 2477 | /* NUMA-aware ordering of nodes */ |
2476 | local_node = pgdat->node_id; | 2478 | local_node = pgdat->node_id; |
2477 | load = num_online_nodes(); | 2479 | load = nr_online_nodes; |
2478 | prev_node = local_node; | 2480 | prev_node = local_node; |
2479 | nodes_clear(used_mask); | 2481 | nodes_clear(used_mask); |
2480 | 2482 | ||
@@ -2625,7 +2627,7 @@ void build_all_zonelists(void) | |||
2625 | 2627 | ||
2626 | printk("Built %i zonelists in %s order, mobility grouping %s. " | 2628 | printk("Built %i zonelists in %s order, mobility grouping %s. " |
2627 | "Total pages: %ld\n", | 2629 | "Total pages: %ld\n", |
2628 | num_online_nodes(), | 2630 | nr_online_nodes, |
2629 | zonelist_order_name[current_zonelist_order], | 2631 | zonelist_order_name[current_zonelist_order], |
2630 | page_group_by_mobility_disabled ? "off" : "on", | 2632 | page_group_by_mobility_disabled ? "off" : "on", |
2631 | vm_total_pages); | 2633 | vm_total_pages); |