diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:19:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:19:37 +0100 |
| commit | efc96737bd82b508794d2b28061a12af4a3f7766 (patch) | |
| tree | e9fe4982967b74c0d25a35a2d7f7c62d8be98a47 /tools/perf | |
| parent | 1ec454baf1245df4fdb5dae728da3363630ce6de (diff) | |
| parent | 7e9a49ef542610609144d1afcd516dc3fafac4d6 (diff) | |
| download | linux-efc96737bd82b508794d2b28061a12af4a3f7766.tar.gz linux-efc96737bd82b508794d2b28061a12af4a3f7766.tar.bz2 linux-efc96737bd82b508794d2b28061a12af4a3f7766.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 0a7ed5b5e281..6c164dc9ee95 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -1537,6 +1537,8 @@ process_flags(struct event *event, struct print_arg *arg, char **tok) field = malloc_or_die(sizeof(*field)); type = process_arg(event, field, &token); + while (type == EVENT_OP) + type = process_op(event, field, &token); if (test_type_token(type, token, EVENT_DELIM, ",")) goto out_free; |