Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / util / stat-display.c

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index ca326f9..c588a6b 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -825,11 +825,11 @@ static void counter_aggr_cb(struct perf_stat_config *config __maybe_unused,
                            bool first __maybe_unused)
 {
        struct caggr_data *cd = data;
-       struct perf_stat_evsel *ps = counter->stats;
+       struct perf_counts_values *aggr = &counter->counts->aggr;
 
-       cd->avg += avg_stats(&ps->res_stats[0]);
-       cd->avg_enabled += avg_stats(&ps->res_stats[1]);
-       cd->avg_running += avg_stats(&ps->res_stats[2]);
+       cd->avg += aggr->val;
+       cd->avg_enabled += aggr->ena;
+       cd->avg_running += aggr->run;
 }
 
 /*