1 files changed, 12 insertions, 14 deletions

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 76a524b4c90f..814cdebf7377 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1089,22 +1089,20 @@ static unsigned long __init setup_memory(void)
 
 void __init zone_sizes_init(void)
 {
-        unsigned long zones_size[MAX_NR_ZONES] = { 0, };
-        unsigned int max_dma, low;
-
-        max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
-        low = max_low_pfn;
-
-        if (low < max_dma)
-                zones_size[ZONE_DMA] = low;
-        else {
-                zones_size[ZONE_DMA] = max_dma;
-                zones_size[ZONE_NORMAL] = low - max_dma;
 #ifdef CONFIG_HIGHMEM
-                zones_size[ZONE_HIGHMEM] = highend_pfn - low;
+        unsigned long max_zone_pfns[MAX_NR_ZONES] = {
+                        virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
+                        max_low_pfn,
+                        highend_pfn};
+        add_active_range(0, 0, highend_pfn);
+#else
+        unsigned long max_zone_pfns[MAX_NR_ZONES] = {
+                        virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
+                        max_low_pfn};
+        add_active_range(0, 0, max_low_pfn);
 #endif
-        }
-        free_area_init(zones_size);
+
+        free_area_init_nodes(max_zone_pfns);
 }
 #else
 extern unsigned long __init setup_memory(void);