diff options
author | 2013-02-04 10:56:42 +0100 | |
---|---|---|
committer | 2013-02-06 18:09:27 -0300 | |
commit | 89bb67ff935d461544fed87174bb13dcc4bac673 (patch) | |
tree | 6009163772aa7c03734b1222f317c7803cb3a54c /tools | |
parent | perf perl scripts: Fix SIGALRM and pipe read race for rwtop (diff) | |
download | linux-89bb67ff935d461544fed87174bb13dcc4bac673.tar.gz linux-89bb67ff935d461544fed87174bb13dcc4bac673.tar.bz2 linux-89bb67ff935d461544fed87174bb13dcc4bac673.zip |
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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/parse-events.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 4e0f5c2a9fda..c84f48cf9678 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) { |