Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:

 - almost all of the rest of -mm

 - various other subsystems

Subsystems affected by this patch series:
  memcg, misc, core-kernel, lib, checkpatch, reiserfs, fat, fork,
  cpumask, kexec, uaccess, kconfig, kgdb, bug, ipc, lzo, kasan, madvise,
  cleanups, pagemap

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (77 commits)
  arch/sparc/include/asm/pgtable_64.h: fix build
  mm: treewide: clarify pgtable_page_{ctor,dtor}() naming
  ntfs: remove (un)?likely() from IS_ERR() conditions
  IB/hfi1: remove unlikely() from IS_ERR*() condition
  xfs: remove unlikely() from WARN_ON() condition
  wimax/i2400m: remove unlikely() from WARN*() condition
  fs: remove unlikely() from WARN_ON() condition
  xen/events: remove unlikely() from WARN() condition
  checkpatch: check for nested (un)?likely() calls
  hexagon: drop empty and unused free_initrd_mem
  mm: factor out common parts between MADV_COLD and MADV_PAGEOUT
  mm: introduce MADV_PAGEOUT
  mm: change PAGEREF_RECLAIM_CLEAN with PAGE_REFRECLAIM
  mm: introduce MADV_COLD
  mm: untag user pointers in mmap/munmap/mremap/brk
  vfio/type1: untag user pointers in vaddr_get_pfn
  tee/shm: untag user pointers in tee_shm_register
  media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get
  drm/radeon: untag user pointers in radeon_gem_userptr_ioctl
  drm/amdgpu: untag user pointers
  ...

1 files changed, 17 insertions, 20 deletions

diff --git a/lib/rbtree_test.c b/lib/rbtree_test.c
index 62b8ee92643d..41ae3c7570d3 100644
--- a/lib/rbtree_test.c
+++ b/lib/rbtree_test.c
@@ -77,26 +77,10 @@ static inline void erase_cached(struct test_node *node, struct rb_root_cached *r
 }
 
 
-static inline u32 augment_recompute(struct test_node *node)
-{
-        u32 max = node->val, child_augmented;
-        if (node->rb.rb_left) {
-                child_augmented = rb_entry(node->rb.rb_left, struct test_node,
-                                           rb)->augmented;
-                if (max < child_augmented)
-                        max = child_augmented;
-        }
-        if (node->rb.rb_right) {
-                child_augmented = rb_entry(node->rb.rb_right, struct test_node,
-                                           rb)->augmented;
-                if (max < child_augmented)
-                        max = child_augmented;
-        }
-        return max;
-}
+#define NODE_VAL(node) ((node)->val)
 
-RB_DECLARE_CALLBACKS(static, augment_callbacks, struct test_node, rb,
-                     u32, augmented, augment_recompute)
+RB_DECLARE_CALLBACKS_MAX(static, augment_callbacks,
+                         struct test_node, rb, u32, augmented, NODE_VAL)
 
 static void insert_augmented(struct test_node *node,
                              struct rb_root_cached *root)
@@ -238,7 +222,20 @@ static void check_augmented(int nr_nodes)
         check(nr_nodes);
         for (rb = rb_first(&root.rb_root); rb; rb = rb_next(rb)) {
                 struct test_node *node = rb_entry(rb, struct test_node, rb);
-                WARN_ON_ONCE(node->augmented != augment_recompute(node));
+                u32 subtree, max = node->val;
+                if (node->rb.rb_left) {
+                        subtree = rb_entry(node->rb.rb_left, struct test_node,
+                                           rb)->augmented;
+                        if (max < subtree)
+                                max = subtree;
+                }
+                if (node->rb.rb_right) {
+                        subtree = rb_entry(node->rb.rb_right, struct test_node,
+                                           rb)->augmented;
+                        if (max < subtree)
+                                max = subtree;
+                }
+                WARN_ON_ONCE(node->augmented != max);
         }
 }