The following commit has been merged into the perf/core branch of tip: Commit-ID: 92b5a1545ad51e8225e691e9a29ba33cc9fe37bc Gitweb: https://git.kernel.org/tip/92b5a1545ad51e8225e691e9a29ba33cc9fe37bc Author: Kyle Meyer <mey...@hpe.com> AuthorDate: Tue, 27 Aug 2019 16:43:48 -05:00 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitterDate: Thu, 29 Aug 2019 17:38:32 -03:00
perf stat: Replace MAX_NR_CPUS with cpu__max_cpu() The function cpu__max_cpu() returns the possible number of CPUs as defined in the sysfs and can be used as an alternative for MAX_NR_CPUS in zero_per_pkg() and check_per_pkg(). Signed-off-by: Kyle Meyer <kyle.me...@hpe.com> Reviewed-by: Jiri Olsa <jo...@redhat.com> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Russ Anderson <russ.ander...@hpe.com> Link: http://lore.kernel.org/lkml/20190827214352.94272-4-mey...@stormcage.eag.rdlabs.hpecorp.net Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/stat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 66f8808..f6eb6af 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -210,7 +210,7 @@ void perf_evlist__reset_stats(struct evlist *evlist) static void zero_per_pkg(struct evsel *counter) { if (counter->per_pkg_mask) - memset(counter->per_pkg_mask, 0, MAX_NR_CPUS); + memset(counter->per_pkg_mask, 0, cpu__max_cpu()); } static int check_per_pkg(struct evsel *counter, @@ -229,7 +229,7 @@ static int check_per_pkg(struct evsel *counter, return 0; if (!mask) { - mask = zalloc(MAX_NR_CPUS); + mask = zalloc(cpu__max_cpu()); if (!mask) return -ENOMEM;
