The following commit has been merged into the perf/core branch of tip: Commit-ID: dc84187f32a3e8eb86bd97f3b10494e1f1fe5e7f Gitweb: https://git.kernel.org/tip/dc84187f32a3e8eb86bd97f3b10494e1f1fe5e7f Author: Kyle Meyer <meyerk@xxxxxxx> AuthorDate: Tue, 27 Aug 2019 16:43:51 -05:00 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitterDate: Thu, 29 Aug 2019 17:38:32 -03:00 perf header: 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 write_cache. MAX_CACHES is replaced by cpu__max_cpu() * MAX_CACHE_LVL. Signed-off-by: Kyle Meyer <kyle.meyer@xxxxxxx> Reviewed-by: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Russ Anderson <russ.anderson@xxxxxxx> Link: http://lore.kernel.org/lkml/20190827214352.94272-7-meyerk@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/util/header.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 0a842d9..dd2bb08 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1122,16 +1122,17 @@ static int build_caches(struct cpu_cache_level caches[], u32 size, u32 *cntp) return 0; } -#define MAX_CACHES (MAX_NR_CPUS * 4) +#define MAX_CACHE_LVL 4 static int write_cache(struct feat_fd *ff, struct evlist *evlist __maybe_unused) { - struct cpu_cache_level caches[MAX_CACHES]; + u32 max_caches = cpu__max_cpu() * MAX_CACHE_LVL; + struct cpu_cache_level caches[max_caches]; u32 cnt = 0, i, version = 1; int ret; - ret = build_caches(caches, MAX_CACHES, &cnt); + ret = build_caches(caches, max_caches, &cnt); if (ret) goto out;