Messages in this thread Patch in this message |  | | Date | Wed, 6 Feb 2013 14:12:50 -0800 | From | tip-bot for Jiri Olsa <> | Subject | [tip:perf/core] perf tools: Fix perf_evsel::exclude_GH handling |
| |
Commit-ID: 89bb67ff935d461544fed87174bb13dcc4bac673 Gitweb: http://git.kernel.org/tip/89bb67ff935d461544fed87174bb13dcc4bac673 Author: Jiri Olsa <jolsa@redhat.com> AuthorDate: Mon, 4 Feb 2013 10:56:42 +0100 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Wed, 6 Feb 2013 18:09:27 -0300
perf tools: Fix perf_evsel::exclude_GH handling
Let the perf_evsel::exclude_GH only prevent the reset of exclude_host and exclude_guest attributes in case they were already set.
We cannot reset their values to 0, because they might have other defaults set by event_attr_init.
Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1359971803-2343-2-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/parse-events.c | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 4e0f5c2..c84f48c 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -699,14 +699,6 @@ static int get_event_modifier(struct event_modifier *mod, char *str, int exclude = eu | ek | eh; int exclude_GH = evsel ? evsel->exclude_GH : 0; - /* - * We are here for group and 'GH' was not set as event - * modifier and whatever event/group modifier override - * default 'GH' setup. - */ - if (evsel && !exclude_GH) - eH = eG = 0; - memset(mod, 0, sizeof(*mod)); while (*str) {
|  |