Re: [ 16/40] Revert duplicated perf commit.

From: Ben Hutchings
Date: Wed Mar 20 2013 - 23:32:09 EST


On Mon, 2013-03-18 at 14:10 -0700, Greg Kroah-Hartman wrote:
> 3.0-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> This reverts commit 2431496fbdd142ccc83138d94f3f510a36ce9270 as it was
> applied incorrectly twice.
>
> Thanks to Jiri for pointing this out.
>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Cc: Jiri Slaby <jslaby@xxxxxxx>
> Cc: Andrew Vagin <avagin@xxxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>

3.2.y had the same problem, so I'm making a similar revert there.

Ben.

> ---
> 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;
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

--
Ben Hutchings
It is easier to write an incorrect program than to understand a correct one.

Attachment: signature.asc
Description: This is a digitally signed message part