Merge branch 'next' (accumulated 3.16 merge window patches) into master

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

2 files changed, 20 insertions, 10 deletions

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index c4b2646b6d7c..cfa63ee92c96 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -300,6 +300,12 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
                 goto done;
         }
 
+        if (vma->vm_ops && vma->vm_ops->name) {
+                name = vma->vm_ops->name(vma);
+                if (name)
+                        goto done;
+        }
+
         name = arch_vma_name(vma);
         if (!name) {
                 pid_t tid;
@@ -737,9 +743,6 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma,
                 ptent = pte_file_clear_soft_dirty(ptent);
         }
 
-        if (vma->vm_flags & VM_SOFTDIRTY)
-                vma->vm_flags &= ~VM_SOFTDIRTY;
-
         set_pte_at(vma->vm_mm, addr, pte, ptent);
 #endif
 }
@@ -807,8 +810,9 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
 
         if (type == CLEAR_REFS_SOFT_DIRTY) {
                 soft_dirty_cleared = true;
-                pr_warn_once("The pagemap bits 55-60 has changed their meaning! "
-                                "See the linux/Documentation/vm/pagemap.txt for details.\n");
+                pr_warn_once("The pagemap bits 55-60 has changed their meaning!"
+                             " See the linux/Documentation/vm/pagemap.txt for "
+                             "details.\n");
         }
 
         task = get_proc_task(file_inode(file));
@@ -839,11 +843,17 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                          *
                          * Writing 3 to /proc/pid/clear_refs only affects file
                          * mapped pages.
+                         *
+                         * Writing 4 to /proc/pid/clear_refs affects all pages.
                          */
                         if (type == CLEAR_REFS_ANON && vma->vm_file)
                                 continue;
                         if (type == CLEAR_REFS_MAPPED && !vma->vm_file)
                                 continue;
+                        if (type == CLEAR_REFS_SOFT_DIRTY) {
+                                if (vma->vm_flags & VM_SOFTDIRTY)
+                                        vma->vm_flags &= ~VM_SOFTDIRTY;
+                        }
                         walk_page_range(vma->vm_start, vma->vm_end,
                                         &clear_refs_walk);
                 }
@@ -1408,10 +1418,10 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
         seq_printf(m, "%08lx %s", vma->vm_start, buffer);
 
         if (file) {
-                seq_printf(m, " file=");
+                seq_puts(m, " file=");
                 seq_path(m, &file->f_path, "\n\t= ");
         } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
-                seq_printf(m, " heap");
+                seq_puts(m, " heap");
         } else {
                 pid_t tid = vm_is_stack(task, vma, is_pid);
                 if (tid != 0) {
@@ -1421,14 +1431,14 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
                          */
                         if (!is_pid || (vma->vm_start <= mm->start_stack &&
                             vma->vm_end >= mm->start_stack))
-                                seq_printf(m, " stack");
+                                seq_puts(m, " stack");
                         else
                                 seq_printf(m, " stack:%d", tid);
                 }
         }
 
         if (is_vm_hugetlb_page(vma))
-                seq_printf(m, " huge");
+                seq_puts(m, " huge");
 
         walk_page_range(vma->vm_start, vma->vm_end, &walk);
 
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 6a8e785b29da..382aa890e228 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -42,7 +42,7 @@ static size_t elfnotes_sz;
 /* Total size of vmcore file. */
 static u64 vmcore_size;
 
-static struct proc_dir_entry *proc_vmcore = NULL;
+static struct proc_dir_entry *proc_vmcore;
 
 /*
  * Returns > 0 for RAM pages, 0 for non-RAM pages, < 0 on error