summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-06 11:54:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-06 11:54:33 -0800
commit091c0f86bad6bb0b003dff2f6195508e29548648 (patch)
treed04ef2b42ae456c2f281728413405c2e6af34880 /tools
parent4fb1db334aa2569281481a09840650e7be28161d (diff)
parentddf6e0e50723b62ac76ed18eb53e9417c6eefba7 (diff)
downloadlinux-091c0f86bad6bb0b003dff2f6195508e29548648.tar.bz2
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ftrace: Fix hash record accounting bug perf: Fix parsing of __print_flags() in TP_printk() jump_label: jump_label_inc may return before the code is patched ftrace: Remove force undef config value left for testing tracing: Restore system filter behavior tracing: fix event_subsystem ref counting
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 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;