diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1521100f1e63..5d800d61ddb7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -6847,6 +6847,7 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn) | |||
6847 | /* Initialise every node */ | 6847 | /* Initialise every node */ |
6848 | mminit_verify_pageflags_layout(); | 6848 | mminit_verify_pageflags_layout(); |
6849 | setup_nr_node_ids(); | 6849 | setup_nr_node_ids(); |
6850 | zero_resv_unavail(); | ||
6850 | for_each_online_node(nid) { | 6851 | for_each_online_node(nid) { |
6851 | pg_data_t *pgdat = NODE_DATA(nid); | 6852 | pg_data_t *pgdat = NODE_DATA(nid); |
6852 | free_area_init_node(nid, NULL, | 6853 | free_area_init_node(nid, NULL, |
@@ -6857,7 +6858,6 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn) | |||
6857 | node_set_state(nid, N_MEMORY); | 6858 | node_set_state(nid, N_MEMORY); |
6858 | check_for_memory(pgdat, nid); | 6859 | check_for_memory(pgdat, nid); |
6859 | } | 6860 | } |
6860 | zero_resv_unavail(); | ||
6861 | } | 6861 | } |
6862 | 6862 | ||
6863 | static int __init cmdline_parse_core(char *p, unsigned long *core, | 6863 | static int __init cmdline_parse_core(char *p, unsigned long *core, |
@@ -7033,9 +7033,9 @@ void __init set_dma_reserve(unsigned long new_dma_reserve) | |||
7033 | 7033 | ||
7034 | void __init free_area_init(unsigned long *zones_size) | 7034 | void __init free_area_init(unsigned long *zones_size) |
7035 | { | 7035 | { |
7036 | zero_resv_unavail(); | ||
7036 | free_area_init_node(0, zones_size, | 7037 | free_area_init_node(0, zones_size, |
7037 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); | 7038 | __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); |
7038 | zero_resv_unavail(); | ||
7039 | } | 7039 | } |
7040 | 7040 | ||
7041 | static int page_alloc_cpu_dead(unsigned int cpu) | 7041 | static int page_alloc_cpu_dead(unsigned int cpu) |