aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-14 15:13:02 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-20 12:58:52 -0700
commit4fa9b6e8af83048513049faba0bfaf6b1bf0d1ed (patch)
tree7eb5b5729edbe2c1e8eee8cc03ef31880f379af2 /tools
parentf18f43cb20c3236df02472f84f5183e01c457507 (diff)
downloadkernel_samsung_smdk4412-4fa9b6e8af83048513049faba0bfaf6b1bf0d1ed.zip
kernel_samsung_smdk4412-4fa9b6e8af83048513049faba0bfaf6b1bf0d1ed.tar.gz
kernel_samsung_smdk4412-4fa9b6e8af83048513049faba0bfaf6b1bf0d1ed.tar.bz2
Revert duplicated perf commit.
This reverts commit 2431496fbdd142ccc83138d94f3f510a36ce9270 as it was applied incorrectly twice. Thanks to Jiri for pointing this out. Cc: Jiri Slaby <jslaby@suse.cz> Cc: Andrew Vagin <avagin@openvz.org> Cc: 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, 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;