3 files changed, 21 insertions, 58 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f12ca8fba71b..04f5a0230298 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -233,6 +233,9 @@ config WARN_STACK_SIZE
           This allows you to specify the maximum frame size a function may
           have without the compiler complaining about it.
 
+config ARCH_POPULATES_NODE_MAP
+        def_bool y
+
 source "mm/Kconfig"
 
 config HOLES_IN_ZONE
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index b8a1ce215142..49ef206ec880 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -66,7 +66,6 @@ unsigned long machine_flags = 0;
 
 struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];
 volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */
-unsigned long __initdata zholes_size[MAX_NR_ZONES];
 static unsigned long __initdata memory_end;
 
 /*
@@ -354,21 +353,6 @@ void machine_power_off(void)
  */
 void (*pm_power_off)(void) = machine_power_off;
 
-static void __init
-add_memory_hole(unsigned long start, unsigned long end)
-{
-        unsigned long dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
-
-        if (end <= dma_pfn)
-                zholes_size[ZONE_DMA] += end - start + 1;
-        else if (start > dma_pfn)
-                zholes_size[ZONE_NORMAL] += end - start + 1;
-        else {
-                zholes_size[ZONE_DMA] += dma_pfn - start + 1;
-                zholes_size[ZONE_NORMAL] += end - dma_pfn;
-        }
-}
-
 static int __init early_parse_mem(char *p)
 {
         memory_end = memparse(p, &p);
@@ -521,7 +505,6 @@ setup_memory(void)
 {
         unsigned long bootmap_size;
         unsigned long start_pfn, end_pfn, init_pfn;
-        unsigned long last_rw_end;
         int i;
 
         /*
@@ -577,39 +560,27 @@ setup_memory(void)
         /*
          * Register RAM areas with the bootmem allocator.
          */
-        last_rw_end = start_pfn;
 
         for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
-                unsigned long start_chunk, end_chunk;
+                unsigned long start_chunk, end_chunk, pfn;
 
                 if (memory_chunk[i].type != CHUNK_READ_WRITE)
                         continue;
-                start_chunk = (memory_chunk[i].addr + PAGE_SIZE - 1);
-                start_chunk >>= PAGE_SHIFT;
-                end_chunk = (memory_chunk[i].addr + memory_chunk[i].size);
-                end_chunk >>= PAGE_SHIFT;
-                if (start_chunk < start_pfn)
-                        start_chunk = start_pfn;
-                if (end_chunk > end_pfn)
-                        end_chunk = end_pfn;
-                if (start_chunk < end_chunk) {
-                        /* Initialize storage key for RAM pages */
-                        for (init_pfn = start_chunk ; init_pfn < end_chunk;
-                             init_pfn++)
-                                page_set_storage_key(init_pfn << PAGE_SHIFT,
-                                                     PAGE_DEFAULT_KEY);
-                        free_bootmem(start_chunk << PAGE_SHIFT,
-                                     (end_chunk - start_chunk) << PAGE_SHIFT);
-                        if (last_rw_end < start_chunk)
-                                add_memory_hole(last_rw_end, start_chunk - 1);
-                        last_rw_end = end_chunk;
-                }
+                start_chunk = PFN_DOWN(memory_chunk[i].addr);
+                end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size) - 1;
+                end_chunk = min(end_chunk, end_pfn);
+                if (start_chunk >= end_chunk)
+                        continue;
+                add_active_range(0, start_chunk, end_chunk);
+                pfn = max(start_chunk, start_pfn);
+                for (; pfn <= end_chunk; pfn++)
+                        page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY);
         }
 
         psw_set_key(PAGE_DEFAULT_KEY);
 
-        if (last_rw_end < end_pfn - 1)
-                add_memory_hole(last_rw_end, end_pfn - 1);
+        free_bootmem_with_active_regions(0, max_pfn);
+        reserve_bootmem(0, PFN_PHYS(start_pfn));
 
         /*
          * Reserve the bootmem bitmap itself as well. We do this in two
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 5ea12a573cad..aa39591ca130 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -106,8 +106,8 @@ static void __init setup_ro_region(void)
         }
 }
 
-extern unsigned long __initdata zholes_size[];
 extern void vmem_map_init(void);
+
 /*
  * paging_init() sets up the page tables
  */
@@ -117,8 +117,7 @@ void __init paging_init(void)
         int i;
         unsigned long pgdir_k;
         static const int ssm_mask = 0x04000000L;
-        unsigned long zones_size[MAX_NR_ZONES];
-        unsigned long dma_pfn, high_pfn;
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
 
         pg_dir = swapper_pg_dir;
         
@@ -142,20 +141,10 @@ void __init paging_init(void)
         __ctl_load(pgdir_k, 13, 13);
         __raw_local_irq_ssm(ssm_mask);
 
-        memset(zones_size, 0, sizeof(zones_size));
-        dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
-        high_pfn = max_low_pfn;
-
-        if (dma_pfn > high_pfn)
-                zones_size[ZONE_DMA] = high_pfn;
-        else {
-                zones_size[ZONE_DMA] = dma_pfn;
-                zones_size[ZONE_NORMAL] = high_pfn - dma_pfn;
-        }
-
-        /* Initialize mem_map[].  */
-        free_area_init_node(0, &contig_page_data, zones_size,
-                            __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size);
+        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+        max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
+        max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
+        free_area_init_nodes(max_zone_pfns);
 }
 
 void __init mem_init(void)