Merge tag 'v3.16-rc3' into spi-sh-msiof

Linux 3.16-rc3

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)