diff options
author | 2014-06-14 14:10:08 +0200 | |
---|---|---|
committer | 2014-06-14 14:10:08 +0200 | |
commit | cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (patch) | |
tree | 9eed06e09fbbe3764f47e4da7f8d15b5965f6cb3 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | x86/kprobes: Fix build errors and blacklist context_track_user (diff) | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core (diff) | |
download | wireguard-linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.tar.xz wireguard-linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.zip |
Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 2 |
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) |