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
  ...

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 9599aa72d7a0..3291a8e37490 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -27,6 +27,7 @@
 #include <linux/radix-tree.h>
 #include <linux/percpu.h>
 #include <linux/slab.h>
+#include <linux/kmemleak.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/string.h>
@@ -194,12 +195,17 @@ radix_tree_node_alloc(struct radix_tree_root *root)
                  * succeed in getting a node here (and never reach
                  * kmem_cache_alloc)
                  */
-                rtp = &__get_cpu_var(radix_tree_preloads);
+                rtp = this_cpu_ptr(&radix_tree_preloads);
                 if (rtp->nr) {
                         ret = rtp->nodes[rtp->nr - 1];
                         rtp->nodes[rtp->nr - 1] = NULL;
                         rtp->nr--;
                 }
+                /*
+                 * Update the allocation stack trace as this is more useful
+                 * for debugging.
+                 */
+                kmemleak_update_trace(ret);
         }
         if (ret == NULL)
                 ret = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
@@ -250,14 +256,14 @@ static int __radix_tree_preload(gfp_t gfp_mask)
         int ret = -ENOMEM;
 
         preempt_disable();
-        rtp = &__get_cpu_var(radix_tree_preloads);
+        rtp = this_cpu_ptr(&radix_tree_preloads);
         while (rtp->nr < ARRAY_SIZE(rtp->nodes)) {
                 preempt_enable();
                 node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
                 if (node == NULL)
                         goto out;
                 preempt_disable();
-                rtp = &__get_cpu_var(radix_tree_preloads);
+                rtp = this_cpu_ptr(&radix_tree_preloads);
                 if (rtp->nr < ARRAY_SIZE(rtp->nodes))
                         rtp->nodes[rtp->nr++] = node;
                 else
@@ -1296,7 +1302,6 @@ static inline void radix_tree_shrink(struct radix_tree_root *root)
 /**
  *      __radix_tree_delete_node    -    try to free node after clearing a slot
  *      @root:          radix tree root
- *      @index:         index key
  *      @node:          node containing @index
  *
  *      After clearing the slot at @index in @node from radix tree