Merge branch 'linus' into x86/xen

3 files changed, 64 insertions, 49 deletions

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 29f3a63806b9..05598649b326 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -44,37 +44,34 @@ char  empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));
 
 void show_mem(void)
 {
-        int i, total = 0, reserved = 0;
-        int shared = 0, cached = 0;
+        unsigned long i, total = 0, reserved = 0;
+        unsigned long shared = 0, cached = 0;
+        unsigned long flags;
         struct page *page;
+        pg_data_t *pgdat;
 
         printk("Mem-info:\n");
         show_free_areas();
-        i = max_mapnr;
-        while (i-- > 0) {
-                if (!pfn_valid(i))
-                        continue;
-                page = pfn_to_page(i);
-                total++;
-                if (PageReserved(page))
-                        reserved++;
-                else if (PageSwapCache(page))
-                        cached++;
-                else if (page_count(page))
-                        shared += page_count(page) - 1;
+        for_each_online_pgdat(pgdat) {
+                pgdat_resize_lock(pgdat, &flags);
+                for (i = 0; i < pgdat->node_spanned_pages; i++) {
+                        if (!pfn_valid(pgdat->node_start_pfn + i))
+                                continue;
+                        page = pfn_to_page(pgdat->node_start_pfn + i);
+                        total++;
+                        if (PageReserved(page))
+                                reserved++;
+                        else if (PageSwapCache(page))
+                                cached++;
+                        else if (page_count(page))
+                                shared += page_count(page) - 1;
+                }
+                pgdat_resize_unlock(pgdat, &flags);
         }
-        printk("%d pages of RAM\n", total);
-        printk("%d reserved pages\n", reserved);
-        printk("%d pages shared\n", shared);
-        printk("%d pages swap cached\n", cached);
-
-        printk("%lu pages dirty\n", global_page_state(NR_FILE_DIRTY));
-        printk("%lu pages writeback\n", global_page_state(NR_WRITEBACK));
-        printk("%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));
-        printk("%lu pages slab\n",
-               global_page_state(NR_SLAB_RECLAIMABLE) +
-               global_page_state(NR_SLAB_UNRECLAIMABLE));
-        printk("%lu pages pagetables\n", global_page_state(NR_PAGETABLE));
+        printk("%ld pages of RAM\n", total);
+        printk("%ld reserved pages\n", reserved);
+        printk("%ld pages shared\n", shared);
+        printk("%ld pages swap cached\n", cached);
 }
 
 /*
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 5c1aea97cd12..3d98ba82ea67 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -254,36 +254,46 @@ void disable_noexec(struct mm_struct *mm, struct task_struct *tsk)
 int s390_enable_sie(void)
 {
         struct task_struct *tsk = current;
-        struct mm_struct *mm;
-        int rc;
+        struct mm_struct *mm, *old_mm;
 
-        task_lock(tsk);
-
-        rc = 0;
+        /* Do we have pgstes? if yes, we are done */
         if (tsk->mm->context.pgstes)
-                goto unlock;
+                return 0;
 
-        rc = -EINVAL;
+        /* lets check if we are allowed to replace the mm */
+        task_lock(tsk);
         if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-            tsk->mm != tsk->active_mm || tsk->mm->ioctx_list)
-                goto unlock;
+            tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) {
+                task_unlock(tsk);
+                return -EINVAL;
+        }
+        task_unlock(tsk);
 
-        tsk->mm->context.pgstes = 1;    /* dirty little tricks .. */
+        /* we copy the mm with pgstes enabled */
+        tsk->mm->context.pgstes = 1;
         mm = dup_mm(tsk);
         tsk->mm->context.pgstes = 0;
-
-        rc = -ENOMEM;
         if (!mm)
-                goto unlock;
-        mmput(tsk->mm);
+                return -ENOMEM;
+
+        /* Now lets check again if somebody attached ptrace etc */
+        task_lock(tsk);
+        if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
+            tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) {
+                mmput(mm);
+                task_unlock(tsk);
+                return -EINVAL;
+        }
+
+        /* ok, we are alone. No ptrace, no threads, etc. */
+        old_mm = tsk->mm;
         tsk->mm = tsk->active_mm = mm;
         preempt_disable();
         update_mm(mm, tsk);
         cpu_set(smp_processor_id(), mm->cpu_vm_mask);
         preempt_enable();
-        rc = 0;
-unlock:
         task_unlock(tsk);
-        return rc;
+        mmput(old_mm);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(s390_enable_sie);
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index ea2804808f39..e4868bfc672f 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -27,12 +27,19 @@ struct memory_segment {
 
 static LIST_HEAD(mem_segs);
 
-static pud_t *vmem_pud_alloc(void)
+static void __ref *vmem_alloc_pages(unsigned int order)
+{
+        if (slab_is_available())
+                return (void *)__get_free_pages(GFP_KERNEL, order);
+        return alloc_bootmem_pages((1 << order) * PAGE_SIZE);
+}
+
+static inline pud_t *vmem_pud_alloc(void)
 {
         pud_t *pud = NULL;
 
 #ifdef CONFIG_64BIT
-        pud = vmemmap_alloc_block(PAGE_SIZE * 4, 0);
+        pud = vmem_alloc_pages(2);
         if (!pud)
                 return NULL;
         clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4);
@@ -40,12 +47,12 @@ static pud_t *vmem_pud_alloc(void)
         return pud;
 }
 
-static pmd_t *vmem_pmd_alloc(void)
+static inline pmd_t *vmem_pmd_alloc(void)
 {
         pmd_t *pmd = NULL;
 
 #ifdef CONFIG_64BIT
-        pmd = vmemmap_alloc_block(PAGE_SIZE * 4, 0);
+        pmd = vmem_alloc_pages(2);
         if (!pmd)
                 return NULL;
         clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4);
@@ -207,13 +214,14 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                 if (pte_none(*pt_dir)) {
                         unsigned long new_page;
 
-                        new_page =__pa(vmemmap_alloc_block(PAGE_SIZE, 0));
+                        new_page =__pa(vmem_alloc_pages(0));
                         if (!new_page)
                                 goto out;
                         pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL);
                         *pt_dir = pte;
                 }
         }
+        memset(start, 0, nr * sizeof(struct page));
         ret = 0;
 out:
         flush_tlb_kernel_range(start_addr, end_addr);
@@ -228,7 +236,7 @@ static int insert_memory_segment(struct memory_segment *seg)
 {
         struct memory_segment *tmp;
 
-        if (seg->start + seg->size >= VMEM_MAX_PHYS ||
+        if (seg->start + seg->size > VMEM_MAX_PHYS ||
             seg->start + seg->size < seg->start)
                 return -ERANGE;