From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnaldo Carvalho de Melo Subject: [PATCH 04/47] perf stat: Replace MAX_NR_CPUS with cpu__max_cpu() Date: Sun, 1 Sep 2019 09:22:43 -0300 Message-ID: <20190901122326.5793-5-acme@kernel.org> References: <20190901122326.5793-1-acme@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190901122326.5793-1-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Kyle Meyer , Kyle Meyer , Jiri Olsa , Alexander Shishkin , Peter Zijlstra , Russ Anderson , Arnaldo Carvalho de Melo List-Id: linux-perf-users.vger.kernel.org From: Kyle Meyer 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 Reviewed-by: Jiri Olsa Cc: Alexander Shishkin Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Russ Anderson Link: http://lore.kernel.org/lkml/20190827214352.94272-4-meyerk@stormcage.eag.rdlabs.hpecorp.net Signed-off-by: Arnaldo Carvalho de Melo --- 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 66f8808e57d3..f6eb6af5f151 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; -- 2.21.0