[S390] noexec protection

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

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 4bb21be3b00709bf6f0dbea0ae3d06686d209d81..162a338a5575a6f8b549669da50e82a5861326c7 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -25,6 +25,7 @@
 #include <linux/bootmem.h>
 #include <linux/pfn.h>
 #include <linux/poison.h>
+#include <linux/initrd.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
@@ -103,12 +104,10 @@ static void __init setup_ro_region(void)
                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 void vmem_map_init(void);
-
 /*
  * paging_init() sets up the page tables
  */
@@ -125,11 +124,11 @@ void __init paging_init(void)
 #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();
@@ -176,8 +175,6 @@ void __init mem_init(void)
        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);
 }
 
 void free_initmem(void)