summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-11-04 16:32:25 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-12-05 13:28:47 -0500
commitd06c27b22aa66e48e32f03f9387328a9af9b0625 (patch)
tree784762fe9cbe56919818c8ca66e11f035b92425f
parentbbbf7af4bf8fc69bc751818cf30521080fa47dcb (diff)
downloadlinux-3.10-d06c27b22aa66e48e32f03f9387328a9af9b0625.tar.gz
linux-3.10-d06c27b22aa66e48e32f03f9387328a9af9b0625.tar.bz2
linux-3.10-d06c27b22aa66e48e32f03f9387328a9af9b0625.zip
perf: Fix parsing of __print_flags() in TP_printk()
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. Cc: stable@vger.kernel.org Reported-by: Andrew Vagin <avagin@openvz.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--tools/perf/util/trace-event-parse.c2
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 0a7ed5b5e28..6c164dc9ee9 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;