Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

  - Use index, not CPU id, to find core/pkg id in 'perf stat' (Kan Liang)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index d99d850e1444..ef355fc0e870 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -694,7 +694,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
 static void print_aggr(char *prefix)
 {
         struct perf_evsel *counter;
-        int cpu, cpu2, s, s2, id, nr;
+        int cpu, s, s2, id, nr;
         double uval;
         u64 ena, run, val;
 
@@ -707,8 +707,7 @@ static void print_aggr(char *prefix)
                         val = ena = run = 0;
                         nr = 0;
                         for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
-                                cpu2 = perf_evsel__cpus(counter)->map[cpu];
-                                s2 = aggr_get_id(evsel_list->cpus, cpu2);
+                                s2 = aggr_get_id(perf_evsel__cpus(counter), cpu);
                                 if (s2 != id)
                                         continue;
                                 val += perf_counts(counter->counts, cpu, 0)->val;