Merge tag 'v4.6-rc3' into perf/core, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 32 insertions, 23 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/perf/util/intel-pt-decoder/insn.c b/tools/perf/util/intel-pt-decoder/insn.c
index 47314a64399c..9f26eae6c9f0 100644
--- a/tools/perf/util/intel-pt-decoder/insn.c
+++ b/tools/perf/util/intel-pt-decoder/insn.c
@@ -374,7 +374,7 @@ void insn_get_displacement(struct insn *insn)
                 if (mod == 3)
                         goto out;
                 if (mod == 1) {
-                        insn->displacement.value = get_next(char, insn);
+                        insn->displacement.value = get_next(signed char, insn);
                         insn->displacement.nbytes = 1;
                 } else if (insn->addr_bytes == 2) {
                         if ((mod == 0 && rm == 6) || mod == 2) {
@@ -532,7 +532,7 @@ void insn_get_immediate(struct insn *insn)
 
         switch (inat_immediate_size(insn->attr)) {
         case INAT_IMM_BYTE:
-                insn->immediate.value = get_next(char, insn);
+                insn->immediate.value = get_next(signed char, insn);
                 insn->immediate.nbytes = 1;
                 break;
         case INAT_IMM_WORD:
@@ -566,7 +566,7 @@ void insn_get_immediate(struct insn *insn)
                 goto err_out;
         }
         if (inat_has_second_immediate(insn->attr)) {
-                insn->immediate2.value = get_next(char, insn);
+                insn->immediate2.value = get_next(signed char, insn);
                 insn->immediate2.nbytes = 1;
         }
 done: