Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

  * Bitmask handling and plugin updates (Steven Rostedt)

  * Fix pipe check regression in attr event callback (Jiri Olsa)

  * Prettify the tags/TAGS/cscope targets output (Jiri Olsa)

  * Print array argument as string (Namhyung Kim)

  * Pass protection and flags bits through mmap2 interface (Peter Zijlstra)

  * Update perf tool mmap2 interface with protection and flag bits (Don Zickus)

  * Re-enable mmap interface (Don Zickus)

  * Add mem-mode documentation to report command (Don Zickus)

  * Add sort on dcacheline (Don Zickus)

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

1 files changed, 2 insertions, 0 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index cd9774df3750..1c419321f707 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -197,6 +197,7 @@ static void define_event_symbols(struct event_format *event,
         case PRINT_BSTRING:
         case PRINT_DYNAMIC_ARRAY:
         case PRINT_FUNC:
+        case PRINT_BITMASK:
                 /* we should warn... */
                 return;
         }
@@ -622,6 +623,7 @@ static int python_generate_script(struct pevent *pevent, const char *outfile)
                         fprintf(ofp, "%s=", f->name);
                         if (f->flags & FIELD_IS_STRING ||
                             f->flags & FIELD_IS_FLAG ||
+                            f->flags & FIELD_IS_ARRAY ||
                             f->flags & FIELD_IS_SYMBOLIC)
                                 fprintf(ofp, "%%s");
                         else if (f->flags & FIELD_IS_SIGNED)