diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-24 19:03:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-24 19:03:00 +0200 |
| commit | c985f7812331d79483beab932e8966477411a942 (patch) | |
| tree | 5c4a47df4e954f3439df148eb397ea3ff164b94e /tools/lib/traceevent/parse-filter.c | |
| parent | e76df19bd986656e3c9f4a62e3dd15e7d69b607a (diff) | |
| parent | eaec12d7f526694f24d581a4ad23de6ce0315cd2 (diff) | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Fixes for the recently merged libtraceevent, from Arnaldo Carvalho de Melo:
* Selected fixes for libtraceevent, from various contributors, submitter by
Namhyung Kim in agreement with Steven Rostedt, all from the trace-cmd repo,
i.e. they have been in use for quite a while in trace-cmd.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/traceevent/parse-filter.c')
| -rw-r--r-- | tools/lib/traceevent/parse-filter.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index 2d40c5ed81d6..e08d21ffd3a6 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -325,9 +325,8 @@ static void free_events(struct event_list *events) } static struct filter_arg * -create_arg_item(struct event_format *event, - const char *token, enum filter_arg_type type, - char **error_str) +create_arg_item(struct event_format *event, const char *token, + enum event_type type, char **error_str) { struct format_field *field; struct filter_arg *arg; |