path: root/tools
diff options
authorSteven Rostedt <>2011-11-04 16:32:25 -0400
committerGreg Kroah-Hartman <>2011-12-09 08:55:53 -0800
commit6bdf07f3dd1c2874792bb07cd84d4210cbc15ca7 (patch)
treebaa60a5fd145de42f35435115f8c612edfe9f86c /tools
parent491d3a9bc2ee7ad349a2e03bf259dea8895a5edd (diff)
perf: Fix parsing of __print_flags() in TP_printk()
commit d06c27b22aa66e48e32f03f9387328a9af9b0625 upstream. A update is made to the sched:sched_switch event that adds some logic to the first parameter of the __print_flags() that shows the state of tasks. This change cause perf to fail parsing the flags. A simple fix is needed to have the parser be able to process ops within the argument. Reported-by: Andrew Vagin <> Signed-off-by: Steven Rostedt <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'tools')
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;