2 files changed, 14 insertions, 12 deletions

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 8fa10cf661a8..fdd9e7b66244 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -953,6 +953,9 @@ config NR_CPUS
 config HIGHMEM
         bool "High memory support"
 
+config ARCH_POPULATES_NODE_MAP
+        def_bool y
+
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "mm/Kconfig"
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 523392d460fa..410200046af1 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -358,8 +358,8 @@ void __init do_init_bootmem(void)
  */
 void __init paging_init(void)
 {
-        unsigned long zones_size[MAX_NR_ZONES], i;
-
+        unsigned long start_pfn, end_pfn;
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
 #ifdef CONFIG_HIGHMEM
         map_page(PKMAP_BASE, 0, 0);     /* XXX gross */
         pkmap_page_table = pte_offset_kernel(pmd_offset(pgd_offset_k
@@ -369,19 +369,18 @@ void __init paging_init(void)
                         (KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), KMAP_FIX_BEGIN);
         kmap_prot = PAGE_KERNEL;
 #endif /* CONFIG_HIGHMEM */
-
-        /*
-         * All pages are DMA-able so we put them all in the DMA zone.
-         */
-        zones_size[ZONE_DMA] = total_lowmem >> PAGE_SHIFT;
-        for (i = 1; i < MAX_NR_ZONES; i++)
-                zones_size[i] = 0;
+        /* All pages are DMA-able so we put them all in the DMA zone. */
+        start_pfn = __pa(PAGE_OFFSET) >> PAGE_SHIFT;
+        end_pfn = start_pfn + (total_memory >> PAGE_SHIFT);
+        add_active_range(0, start_pfn, end_pfn);
 
 #ifdef CONFIG_HIGHMEM
-        zones_size[ZONE_HIGHMEM] = (total_memory - total_lowmem) >> PAGE_SHIFT;
+        max_zone_pfns[0] = total_lowmem >> PAGE_SHIFT;
+        max_zone_pfns[1] = total_memory >> PAGE_SHIFT;
+#else
+        max_zone_pfns[0] = total_memory >> PAGE_SHIFT;
 #endif /* CONFIG_HIGHMEM */
-
-        free_area_init(zones_size);
+        free_area_init_nodes(max_zone_pfns);
 }
 
 void __init mem_init(void)