3.16.51-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> commit 5d369a75eda5855d64981668a1d60cfac00d52e9 upstream. Rename it from 'parse_events_evlist' to 'parse_events_state' to better state that this is parsing state that has to be passed around. Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: David Ahern <dsahern@xxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxxx> Cc: Wang Nan <wangnan0@xxxxxxxxxx> Link: http://lkml.kernel.org/n/tip-dursqtg2h2w98ztaa297u43x@xxxxxxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> [bwh: Backported to 3.16: change all uses of the name in this version] Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> --- --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -927,7 +927,7 @@ int parse_events_terms(struct list_head int parse_events(struct perf_evlist *evlist, const char *str) { - struct parse_events_evlist data = { + struct parse_events_state data = { .list = LIST_HEAD_INIT(data.list), .idx = evlist->nr_entries, }; --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -61,7 +61,7 @@ struct parse_events_term { struct list_head list; }; -struct parse_events_evlist { +struct parse_events_state { struct list_head list; int idx; int nr_groups; --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -30,7 +30,7 @@ do { \ } while (0) static inc_group_count(struct list_head *list, - struct parse_events_evlist *data) + struct parse_events_state *data) { /* Count groups only have more than 1 members */ if (!list_is_last(list->next, list)) @@ -93,7 +93,7 @@ PE_START_TERMS start_terms start_events: groups { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; parse_events_update_lists($1, &data->list); } @@ -202,7 +202,7 @@ event_def: event_pmu | event_pmu: PE_NAME '/' event_config '/' { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -219,7 +219,7 @@ PE_VALUE_SYM_SW event_legacy_symbol: value_sym '/' event_config '/' { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; int type = $1 >> 16; int config = $1 & 255; @@ -233,7 +233,7 @@ value_sym '/' event_config '/' | value_sym sep_slash_dc { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; int type = $1 >> 16; int config = $1 & 255; @@ -247,7 +247,7 @@ value_sym sep_slash_dc event_legacy_cache: PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -257,7 +257,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_ | PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -267,7 +267,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_ | PE_NAME_CACHE_TYPE { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -278,7 +278,7 @@ PE_NAME_CACHE_TYPE event_legacy_mem: PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -289,7 +289,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_B | PE_PREFIX_MEM PE_VALUE sep_dc { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -301,7 +301,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc event_legacy_tracepoint: PE_NAME '-' PE_NAME ':' PE_NAME { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; char sys_name[128]; snprintf(&sys_name, 128, "%s-%s", $1, $3); @@ -313,7 +313,7 @@ PE_NAME '-' PE_NAME ':' PE_NAME | PE_NAME ':' PE_NAME { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -324,7 +324,7 @@ PE_NAME ':' PE_NAME event_legacy_numeric: PE_VALUE ':' PE_VALUE { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list); @@ -335,7 +335,7 @@ PE_VALUE ':' PE_VALUE event_legacy_raw: PE_RAW { - struct parse_events_evlist *data = _data; + struct parse_events_state *data = _data; struct list_head *list; ALLOC_LIST(list);