diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-03-21 03:25:51 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-27 02:41:00 +0000 |
| commit | 0aa85e5ef7f7243b06d9ce8162de7a397f17ce20 (patch) | |
| tree | 1cf8cca30a51de3b10767f9ed6d7027c10ffcba4 /tools | |
| parent | 7f94759d8ca007458974023d2ac9ffd9cf0df52d (diff) | |
| download | kernel_samsung_smdk4412-0aa85e5ef7f7243b06d9ce8162de7a397f17ce20.zip kernel_samsung_smdk4412-0aa85e5ef7f7243b06d9ce8162de7a397f17ce20.tar.gz kernel_samsung_smdk4412-0aa85e5ef7f7243b06d9ce8162de7a397f17ce20.tar.bz2 | |
perf: Revert duplicated commit
This reverts commit 923415295307845e614589c1cce62abedd4d1731
'perf: Fix parsing of __print_flags() in TP_printk()'. The same
change was already included in 3.2 as commit
d06c27b22aa66e48e32f03f9387328a9af9b0625 but in 3.2.1 this change
was wrongly applied to similar code in a different function.
Thanks to Jiri for pointing this out in 3.0.y.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Andrew Vagin <avagin@openvz.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index bf54c48..6c164dc 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -1582,8 +1582,6 @@ 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; |