Commit 4c0b2e5f authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar

x86, mm: Move zone init from paging_init() on 64-bit

This patch introduces a zone_sizes_init() helper function on
64-bit to make it more similar to 32-bit init.
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1320155902-10424-2-git-send-email-penberg@kernel.orgSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ff14c1d0
...@@ -612,7 +612,7 @@ void __init initmem_init(void) ...@@ -612,7 +612,7 @@ void __init initmem_init(void)
} }
#endif #endif
void __init paging_init(void) static void __init zone_sizes_init(void)
{ {
unsigned long max_zone_pfns[MAX_NR_ZONES]; unsigned long max_zone_pfns[MAX_NR_ZONES];
...@@ -623,6 +623,11 @@ void __init paging_init(void) ...@@ -623,6 +623,11 @@ void __init paging_init(void)
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN; max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
max_zone_pfns[ZONE_NORMAL] = max_pfn; max_zone_pfns[ZONE_NORMAL] = max_pfn;
free_area_init_nodes(max_zone_pfns);
}
void __init paging_init(void)
{
sparse_memory_present_with_active_regions(MAX_NUMNODES); sparse_memory_present_with_active_regions(MAX_NUMNODES);
sparse_init(); sparse_init();
...@@ -634,7 +639,7 @@ void __init paging_init(void) ...@@ -634,7 +639,7 @@ void __init paging_init(void)
*/ */
node_clear_state(0, N_NORMAL_MEMORY); node_clear_state(0, N_NORMAL_MEMORY);
free_area_init_nodes(max_zone_pfns); zone_sizes_init();
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment