Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / x86 / mm / init_64.c

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a8a56ce3a962ad7c1c46285830dd8cb994695231..436a0309db332fe54c5a76dbf3952cadd5f16ece 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -614,15 +614,6 @@ void __init initmem_init(void)
 
 void __init paging_init(void)
 {
-       unsigned long max_zone_pfns[MAX_NR_ZONES];
-
-       memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-#ifdef CONFIG_ZONE_DMA
-       max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
-#endif
-       max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
-       max_zone_pfns[ZONE_NORMAL] = max_pfn;
-
        sparse_memory_present_with_active_regions(MAX_NUMNODES);
        sparse_init();
 
@@ -634,7 +625,7 @@ void __init paging_init(void)
         */
        node_clear_state(0, N_NORMAL_MEMORY);
 
-       free_area_init_nodes(max_zone_pfns);
+       zone_sizes_init();
 }
 
 /*