aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-11-04 16:32:25 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-12 11:35:05 -0800
commit2431496fbdd142ccc83138d94f3f510a36ce9270 (patch)
tree167a353749646746be9e253d1426c4923cd18a02 /tools
parent0853141b9eff15c72dde6868ee5351db3f7d12f1 (diff)
downloadkernel_samsung_aries-2431496fbdd142ccc83138d94f3f510a36ce9270.zip
kernel_samsung_aries-2431496fbdd142ccc83138d94f3f510a36ce9270.tar.gz
kernel_samsung_aries-2431496fbdd142ccc83138d94f3f510a36ce9270.tar.bz2
perf: Fix parsing of __print_flags() in TP_printk()
commit 49908a1b25d448d68fd26faca260e1850201575f 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 <avagin@openvz.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'tools')
-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 6c164dc..bf54c48 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1582,6 +1582,8 @@ process_symbols(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;