1 files changed, 49 insertions, 11 deletions

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 30eb6d02ddb8..59b663109d90 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -38,19 +38,59 @@
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
 
-char  empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));
+unsigned long empty_zero_page, zero_page_mask;
 EXPORT_SYMBOL(empty_zero_page);
 
+static unsigned long setup_zero_pages(void)
+{
+        struct cpuid cpu_id;
+        unsigned int order;
+        unsigned long size;
+        struct page *page;
+        int i;
+
+        get_cpu_id(&cpu_id);
+        switch (cpu_id.machine) {
+        case 0x9672:    /* g5 */
+        case 0x2064:    /* z900 */
+        case 0x2066:    /* z900 */
+        case 0x2084:    /* z990 */
+        case 0x2086:    /* z990 */
+        case 0x2094:    /* z9-109 */
+        case 0x2096:    /* z9-109 */
+                order = 0;
+                break;
+        case 0x2097:    /* z10 */
+        case 0x2098:    /* z10 */
+        default:
+                order = 2;
+                break;
+        }
+
+        empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
+        if (!empty_zero_page)
+                panic("Out of memory in setup_zero_pages");
+
+        page = virt_to_page((void *) empty_zero_page);
+        split_page(page, order);
+        for (i = 1 << order; i > 0; i--) {
+                SetPageReserved(page);
+                page++;
+        }
+
+        size = PAGE_SIZE << order;
+        zero_page_mask = (size - 1) & PAGE_MASK;
+
+        return 1UL << order;
+}
+
 /*
  * paging_init() sets up the page tables
  */
 void __init paging_init(void)
 {
-        static const int ssm_mask = 0x04000000L;
         unsigned long max_zone_pfns[MAX_NR_ZONES];
         unsigned long pgd_type;
 
@@ -72,18 +112,17 @@ void __init paging_init(void)
         __ctl_load(S390_lowcore.kernel_asce, 1, 1);
         __ctl_load(S390_lowcore.kernel_asce, 7, 7);
         __ctl_load(S390_lowcore.kernel_asce, 13, 13);
-        __raw_local_irq_ssm(ssm_mask);
+        arch_local_irq_restore(4UL << (BITS_PER_LONG - 8));
 
         atomic_set(&init_mm.context.attach_count, 1);
 
         sparse_memory_present_with_active_regions(MAX_NUMNODES);
         sparse_init();
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-#ifdef CONFIG_ZONE_DMA
         max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
-#endif
         max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
         free_area_init_nodes(max_zone_pfns);
+        fault_init();
 }
 
 void __init mem_init(void)
@@ -93,14 +132,12 @@ void __init mem_init(void)
         max_mapnr = num_physpages = max_low_pfn;
         high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
 
-        /* clear the zero-page */
-        memset(empty_zero_page, 0, PAGE_SIZE);
-
         /* Setup guest page hinting */
         cmma_init();
 
         /* this will put all low memory onto the freelists */
         totalram_pages += free_all_bootmem();
+        totalram_pages -= setup_zero_pages();   /* Setup zeroed pages. */
 
         reservedpages = 0;
 
@@ -136,7 +173,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
                 pmd = pmd_offset(pud, address);
                 pte = pte_offset_kernel(pmd, address);
                 if (!enable) {
-                        ptep_invalidate(&init_mm, address, pte);
+                        __ptep_ipte(address, pte);
+                        pte_val(*pte) = _PAGE_TYPE_EMPTY;
                         continue;
                 }
                 *pte = mk_pte_phys(address, __pgprot(_PAGE_TYPE_RW));