Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / arch / s390 / mm / init.c

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 5ea12a573cad3299af3eb30b9af31c55722470ec..b3e7c45efb63110f064ab77693e5349b71d081de 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -24,7 +24,8 @@
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>
 #include <linux/pfn.h>
-
+#include <linux/poison.h>
+#include <linux/initrd.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -94,20 +95,18 @@ static void __init setup_ro_region(void)
        pte_t new_pte;
        unsigned long address, end;
 
-       address = ((unsigned long)&__start_rodata) & PAGE_MASK;
-       end = PFN_ALIGN((unsigned long)&__end_rodata);
+       address = ((unsigned long)&_stext) & PAGE_MASK;
+       end = PFN_ALIGN((unsigned long)&_eshared);
 
        for (; address < end; address += PAGE_SIZE) {
                pgd = pgd_offset_k(address);
                pmd = pmd_offset(pgd, address);
                pte = pte_offset_kernel(pmd, address);
                new_pte = mk_pte_phys(address, __pgprot(_PAGE_RO));
-               set_pte(pte, new_pte);
+               *pte = new_pte;
        }
 }
 
-extern unsigned long __initdata zholes_size[];
-extern void vmem_map_init(void);
 /*
  * paging_init() sets up the page tables
  */
@@ -117,19 +116,18 @@ 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;
        
 #ifdef CONFIG_64BIT
        pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERN_REGION_TABLE;
        for (i = 0; i < PTRS_PER_PGD; i++)
-               pgd_clear(pg_dir + i);
+               pgd_clear_kernel(pg_dir + i);
 #else
        pgdir_k = (__pa(swapper_pg_dir) & PAGE_MASK) | _KERNSEG_TABLE;
        for (i = 0; i < PTRS_PER_PGD; i++)
-               pmd_clear((pmd_t *)(pg_dir + i));
+               pmd_clear_kernel((pmd_t *)(pg_dir + i));
 #endif
        vmem_map_init();
        setup_ro_region();
@@ -142,20 +140,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)
@@ -184,10 +172,8 @@ void __init mem_init(void)
                 datasize >>10,
                 initsize >> 10);
        printk("Write protected kernel read-only data: %#lx - %#lx\n",
-              (unsigned long)&__start_rodata,
-              PFN_ALIGN((unsigned long)&__end_rodata) - 1);
-       printk("Virtual memmap size: %ldk\n",
-              (max_pfn * sizeof(struct page)) >> 10);
+              (unsigned long)&_stext,
+              PFN_ALIGN((unsigned long)&_eshared) - 1);
 }
 
 void free_initmem(void)
@@ -198,6 +184,7 @@ void free_initmem(void)
         for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
                ClearPageReserved(virt_to_page(addr));
                init_page_count(virt_to_page(addr));
+               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
                free_page(addr);
                totalram_pages++;
         }