diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 24aa3d1b9d96..e43aae135b38 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3461,10 +3461,11 @@ static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat) | |||
3461 | #endif /* CONFIG_FLAT_NODE_MEM_MAP */ | 3461 | #endif /* CONFIG_FLAT_NODE_MEM_MAP */ |
3462 | } | 3462 | } |
3463 | 3463 | ||
3464 | void __paginginit free_area_init_node(int nid, struct pglist_data *pgdat, | 3464 | void __paginginit free_area_init_node(int nid, unsigned long *zones_size, |
3465 | unsigned long *zones_size, unsigned long node_start_pfn, | 3465 | unsigned long node_start_pfn, unsigned long *zholes_size) |
3466 | unsigned long *zholes_size) | ||
3467 | { | 3466 | { |
3467 | pg_data_t *pgdat = NODE_DATA(nid); | ||
3468 | |||
3468 | pgdat->node_id = nid; | 3469 | pgdat->node_id = nid; |
3469 | pgdat->node_start_pfn = node_start_pfn; | 3470 | pgdat->node_start_pfn = node_start_pfn; |
3470 | calculate_node_totalpages(pgdat, zones_size, zholes_size); | 3471 | calculate_node_totalpages(pgdat, zones_size, zholes_size); |
@@ -3961,7 +3962,7 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn) | |||
3961 | setup_nr_node_ids(); | 3962 | setup_nr_node_ids(); |
3962 | for_each_online_node(nid) { | 3963 | for_each_online_node(nid) { |
3963 | pg_data_t *pgdat = NODE_DATA(nid); | 3964 | pg_data_t *pgdat = NODE_DATA(nid); |
3964 | free_area_init_node(nid, pgdat, NULL, | 3965 | free_area_init_node(nid, NULL, |
3965 | find_min_pfn_for_node(nid), NULL); | 3966 | find_min_pfn_for_node(nid), NULL); |
3966 | 3967 | ||
3967 | /* Any memory on that node */ | 3968 | /* Any memory on that node */ |
@@ -4032,7 +4033,7 @@ EXPORT_SYMBOL(contig_page_data); | |||
4032 | 4033 | ||
4033 | void __init free_area_init(unsigned long *zones_size) | 4034 | void __init free_area_init(unsigned long *zones_size) |
4034 | { | 4035 | { |
4035 | free_area_init_node(0, NODE_DATA(0), zones_size, | 4036 | free_area_init_node(0, zones_size, |
4036 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); | 4037 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); |
4037 | } | 4038 | } |
4038 | 4039 | ||