blob: ca28e212e7bd2729820cd44181df526499685f29 [file] [log] [blame]
From foo@baz Thu Mar 14 15:13:02 PDT 2013
Date: Thu, 14 Mar 2013 15:13:02 -0700
To: Greg KH <gregkh@linuxfoundation.org>
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: 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>
---
tools/perf/util/trace-event-parse.c | 2 --
1 file changed, 2 deletions(-)
--- 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, str
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;