Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2 updates

 - almost all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (131 commits)
  memory hotplug: fix comments when adding section
  mm: make alloc_node_mem_map a void call if we don't have CONFIG_FLAT_NODE_MEM_MAP
  mm: simplify nodemask printing
  mm,oom_reaper: remove pointless kthread_run() error check
  mm/page_ext.c: check if page_ext is not prepared
  writeback: remove unused function parameter
  mm: do not rely on preempt_count in print_vma_addr
  mm, sparse: do not swamp log with huge vmemmap allocation failures
  mm/hmm: remove redundant variable align_end
  mm/list_lru.c: mark expected switch fall-through
  mm/shmem.c: mark expected switch fall-through
  mm/page_alloc.c: broken deferred calculation
  mm: don't warn about allocations which stall for too long
  fs: fuse: account fuse_inode slab memory as reclaimable
  mm, page_alloc: fix potential false positive in __zone_watermark_ok
  mm: mlock: remove lru_add_drain_all()
  mm, sysctl: make NUMA stats configurable
  shmem: convert shmem_init_inodecache() to void
  Unify migrate_pages and move_pages access checks
  mm, pagevec: rename pagevec drained field
  ...

4 files changed, 11 insertions, 12 deletions

diff --git a/tools/include/linux/kmemcheck.h b/tools/include/linux/kmemcheck.h
index 2bccd2c7b897..ea32a7d3cf1b 100644
--- a/tools/include/linux/kmemcheck.h
+++ b/tools/include/linux/kmemcheck.h
@@ -1,9 +1 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _LIBLOCKDEP_LINUX_KMEMCHECK_H_
-#define _LIBLOCKDEP_LINUX_KMEMCHECK_H_
-
-static inline void kmemcheck_mark_initialized(void *address, unsigned int n)
-{
-}
-
-#endif
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 557d391f564a..ae11e4c3516a 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -641,7 +641,6 @@ static const struct {
         { "__GFP_ATOMIC",               "_A" },
         { "__GFP_IO",                   "I" },
         { "__GFP_FS",                   "F" },
-        { "__GFP_COLD",                 "CO" },
         { "__GFP_NOWARN",               "NWR" },
         { "__GFP_RETRY_MAYFAIL",        "R" },
         { "__GFP_NOFAIL",               "NF" },
@@ -655,7 +654,6 @@ static const struct {
         { "__GFP_RECLAIMABLE",          "RC" },
         { "__GFP_MOVABLE",              "M" },
         { "__GFP_ACCOUNT",              "AC" },
-        { "__GFP_NOTRACK",              "NT" },
         { "__GFP_WRITE",                "WR" },
         { "__GFP_RECLAIM",              "R" },
         { "__GFP_DIRECT_RECLAIM",       "DR" },
diff --git a/tools/testing/radix-tree/multiorder.c b/tools/testing/radix-tree/multiorder.c
index 06c71178d07d..59245b3d587c 100644
--- a/tools/testing/radix-tree/multiorder.c
+++ b/tools/testing/radix-tree/multiorder.c
@@ -618,7 +618,7 @@ static void multiorder_account(void)
         __radix_tree_insert(&tree, 1 << 5, 5, (void *)0x12);
         __radix_tree_lookup(&tree, 1 << 5, &node, &slot);
         assert(node->count == node->exceptional * 2);
-        __radix_tree_replace(&tree, node, slot, NULL, NULL, NULL);
+        __radix_tree_replace(&tree, node, slot, NULL, NULL);
         assert(node->exceptional == 0);
 
         item_kill_tree(&tree);
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index b0b7ef6d0de1..f82c2eaa859d 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -84,6 +84,7 @@ int output_lines = -1;
 int sort_loss;
 int extended_totals;
 int show_bytes;
+int unreclaim_only;
 
 /* Debug options */
 int sanity;
@@ -133,6 +134,7 @@ static void usage(void)
                 "-L|--Loss              Sort by loss\n"
                 "-X|--Xtotals           Show extended summary information\n"
                 "-B|--Bytes             Show size in bytes\n"
+                "-U|--Unreclaim         Show unreclaimable slabs only\n"
                 "\nValid debug options (FZPUT may be combined)\n"
                 "a / A          Switch on all debug options (=FZUP)\n"
                 "-              Switch off all debug options\n"
@@ -569,6 +571,9 @@ static void slabcache(struct slabinfo *s)
         if (strcmp(s->name, "*") == 0)
                 return;
 
+        if (unreclaim_only && s->reclaim_account)
+                return;
+
         if (actual_slabs == 1) {
                 report(s);
                 return;
@@ -1347,6 +1352,7 @@ struct option opts[] = {
         { "Loss", no_argument, NULL, 'L'},
         { "Xtotals", no_argument, NULL, 'X'},
         { "Bytes", no_argument, NULL, 'B'},
+        { "Unreclaim", no_argument, NULL, 'U'},
         { NULL, 0, NULL, 0 }
 };
 
@@ -1358,7 +1364,7 @@ int main(int argc, char *argv[])
 
         page_size = getpagesize();
 
-        while ((c = getopt_long(argc, argv, "aAd::Defhil1noprstvzTSN:LXB",
+        while ((c = getopt_long(argc, argv, "aAd::Defhil1noprstvzTSN:LXBU",
                                                 opts, NULL)) != -1)
                 switch (c) {
                 case '1':
@@ -1439,6 +1445,9 @@ int main(int argc, char *argv[])
                 case 'B':
                         show_bytes = 1;
                         break;
+                case 'U':
+                        unreclaim_only = 1;
+                        break;
                 default:
                         fatal("%s: Invalid option '%c'\n", argv[0], optopt);