Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c09e0d6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 64291f7d 601083cf

tools/perf/builtin-stat.c

+2 −3
Original line number Diff line number Diff line
@@ -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;