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: Tejun Heo <tj@kernel.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1320155902-10424-2-git-send-email-penberg@kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index bbaaa005bf0e865a9c3fc84a7ff1ed9854b80888..3ddda59f70873b20878b1c173940bc3ea4b0ab78 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -612,7 +612,7 @@ void __init initmem_init(void)
 }
 #endif
 
-void __init paging_init(void)
+static void __init zone_sizes_init(void)
 {
        unsigned long max_zone_pfns[MAX_NR_ZONES];
 
@@ -623,6 +623,11 @@ void __init paging_init(void)
        max_zone_pfns[ZONE_DMA32] = MAX_DMA32_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_init();
 
@@ -634,7 +639,7 @@ void __init paging_init(void)
         */
        node_clear_state(0, N_NORMAL_MEMORY);
 
-       free_area_init_nodes(max_zone_pfns);
+       zone_sizes_init();
 }
 
 /*