[PATCH] s390: fix memory holes and cleanup setup_arch
[linux-3.10.git] / arch / s390 / mm / init.c
index 8e723bc7f795caef16e65dd0bbcc9cbda052047b..6ec5cd981e74f7d3f84e8d371a6e2e64261dd4de 100644 (file)
@@ -101,6 +101,7 @@ extern unsigned long _end;
 extern unsigned long __init_begin;
 extern unsigned long __init_end;
 
+extern unsigned long __initdata zholes_size[];
 /*
  * paging_init() sets up the page tables
  */
@@ -163,10 +164,13 @@ void __init paging_init(void)
         local_flush_tlb();
 
        {
-               unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0};
+               unsigned long zones_size[MAX_NR_ZONES];
 
+               memset(zones_size, 0, sizeof(zones_size));
                zones_size[ZONE_DMA] = max_low_pfn;
-               free_area_init(zones_size);
+               free_area_init_node(0, &contig_page_data, zones_size,
+                                   __pa(PAGE_OFFSET) >> PAGE_SHIFT,
+                                   zholes_size);
        }
         return;
 }
@@ -184,9 +188,10 @@ void __init paging_init(void)
           _KERN_REGION_TABLE;
        static const int ssm_mask = 0x04000000L;
 
-       unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+       unsigned long zones_size[MAX_NR_ZONES];
        unsigned long dma_pfn, high_pfn;
 
+       memset(zones_size, 0, sizeof(zones_size));
        dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
        high_pfn = max_low_pfn;
 
@@ -198,8 +203,8 @@ void __init paging_init(void)
        }
 
        /* Initialize mem_map[].  */
-       free_area_init(zones_size);
-
+       free_area_init_node(0, &contig_page_data, zones_size,
+                           __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size);
 
        /*
         * map whole physical memory to virtual memory (identity mapping)