perf stat: Combine the -A/--no-aggr and --no-merge options

[sfrench/cifs-2.6.git] / tools / perf / util / stat.c

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 012c4946b9c495131a1e2e5ccc2860eb6658d228..b0bcf92f0f9c37e9d74bade174c148ce4c7a8805 100644 (file)
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -592,7 +592,7 @@ void perf_stat_merge_counters(struct perf_stat_config *config, struct evlist *ev
 {
        struct evsel *evsel;
 
-       if (config->no_merge)
+       if (config->aggr_mode == AGGR_NONE)
                return;
 
        evlist__for_each_entry(evlist, evsel)