Merge branch 'akpm' (patches from Andrew)

Merge first patch-bomb from Andrew Morton:

 - some misc things

 - ofs2 updates

 - about half of MM

 - checkpatch updates

 - autofs4 update

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits)
  autofs4: fix string.h include in auto_dev-ioctl.h
  autofs4: use pr_xxx() macros directly for logging
  autofs4: change log print macros to not insert newline
  autofs4: make autofs log prints consistent
  autofs4: fix some white space errors
  autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked()
  autofs4: fix coding style line length in autofs4_wait()
  autofs4: fix coding style problem in autofs4_get_set_timeout()
  autofs4: coding style fixes
  autofs: show pipe inode in mount options
  kallsyms: add support for relative offsets in kallsyms address table
  kallsyms: don't overload absolute symbol type for percpu symbols
  x86: kallsyms: disable absolute percpu symbols on !SMP
  checkpatch: fix another left brace warning
  checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses
  checkpatch: warn on bare unsigned or signed declarations without int
  checkpatch: exclude asm volatile from complex macro check
  mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate()
  mm: migrate: consolidate mem_cgroup_migrate() calls
  mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
  ...

2 files changed, 30 insertions, 21 deletions

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 4d3340cce9a0..c9cb3be47cff 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -602,7 +602,7 @@ static int gfpcmp(const void *a, const void *b)
         return fa->flags - fb->flags;
 }
 
-/* see include/trace/events/gfpflags.h */
+/* see include/trace/events/mmflags.h */
 static const struct {
         const char *original;
         const char *compact;
@@ -612,30 +612,39 @@ static const struct {
         { "GFP_HIGHUSER",               "HU" },
         { "GFP_USER",                   "U" },
         { "GFP_TEMPORARY",              "TMP" },
+        { "GFP_KERNEL_ACCOUNT",         "KAC" },
         { "GFP_KERNEL",                 "K" },
         { "GFP_NOFS",                   "NF" },
         { "GFP_ATOMIC",                 "A" },
         { "GFP_NOIO",                   "NI" },
-        { "GFP_HIGH",                   "H" },
-        { "GFP_WAIT",                   "W" },
-        { "GFP_IO",                     "I" },
-        { "GFP_COLD",                   "CO" },
-        { "GFP_NOWARN",                 "NWR" },
-        { "GFP_REPEAT",                 "R" },
-        { "GFP_NOFAIL",                 "NF" },
-        { "GFP_NORETRY",                "NR" },
-        { "GFP_COMP",                   "C" },
-        { "GFP_ZERO",                   "Z" },
-        { "GFP_NOMEMALLOC",             "NMA" },
-        { "GFP_MEMALLOC",               "MA" },
-        { "GFP_HARDWALL",               "HW" },
-        { "GFP_THISNODE",               "TN" },
-        { "GFP_RECLAIMABLE",            "RC" },
-        { "GFP_MOVABLE",                "M" },
-        { "GFP_NOTRACK",                "NT" },
-        { "GFP_NO_KSWAPD",              "NK" },
-        { "GFP_OTHER_NODE",             "ON" },
         { "GFP_NOWAIT",                 "NW" },
+        { "GFP_DMA",                    "D" },
+        { "__GFP_HIGHMEM",              "HM" },
+        { "GFP_DMA32",                  "D32" },
+        { "__GFP_HIGH",                 "H" },
+        { "__GFP_ATOMIC",               "_A" },
+        { "__GFP_IO",                   "I" },
+        { "__GFP_FS",                   "F" },
+        { "__GFP_COLD",                 "CO" },
+        { "__GFP_NOWARN",               "NWR" },
+        { "__GFP_REPEAT",               "R" },
+        { "__GFP_NOFAIL",               "NF" },
+        { "__GFP_NORETRY",              "NR" },
+        { "__GFP_COMP",                 "C" },
+        { "__GFP_ZERO",                 "Z" },
+        { "__GFP_NOMEMALLOC",           "NMA" },
+        { "__GFP_MEMALLOC",             "MA" },
+        { "__GFP_HARDWALL",             "HW" },
+        { "__GFP_THISNODE",             "TN" },
+        { "__GFP_RECLAIMABLE",          "RC" },
+        { "__GFP_MOVABLE",              "M" },
+        { "__GFP_ACCOUNT",              "AC" },
+        { "__GFP_NOTRACK",              "NT" },
+        { "__GFP_WRITE",                "WR" },
+        { "__GFP_RECLAIM",              "R" },
+        { "__GFP_DIRECT_RECLAIM",       "DR" },
+        { "__GFP_KSWAPD_RECLAIM",       "KR" },
+        { "__GFP_OTHER_NODE",           "ON" },
 };
 
 static size_t max_gfp_len;
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index 86e698d07e20..1889163f2f05 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -135,7 +135,7 @@ static void usage(void)
                 "\nValid debug options (FZPUT may be combined)\n"
                 "a / A          Switch on all debug options (=FZUP)\n"
                 "-              Switch off all debug options\n"
-                "f / F          Sanity Checks (SLAB_DEBUG_FREE)\n"
+                "f / F          Sanity Checks (SLAB_CONSISTENCY_CHECKS)\n"
                 "z / Z          Redzoning\n"
                 "p / P          Poisoning\n"
                 "u / U          Tracking\n"