summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/session.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2021-01-20 18:35:31 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2021-01-20 18:35:31 +0100
commitcd07e536b0201fceffd90a701bfb1e1fc07fcd34 (patch)
tree4777d4b2f749b279fc07bd41f11b88c9e4578afe /tools/perf/util/session.c
parentperf tools: Add 'ping' control command (diff)
parentMerge tag 'task_work-2021-01-19' of git://git.kernel.dk/linux-block (diff)
downloadlinux-cd07e536b0201fceffd90a701bfb1e1fc07fcd34.tar.xz
linux-cd07e536b0201fceffd90a701bfb1e1fc07fcd34.zip
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r--tools/perf/util/session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 492c994c948a..5b1a31cae047 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2410,7 +2410,7 @@ int perf_session__cpu_bitmap(struct perf_session *session,
{
int i, err = -1;
struct perf_cpu_map *map;
- int nr_cpus = min(session->header.env.nr_cpus_online, MAX_NR_CPUS);
+ int nr_cpus = min(session->header.env.nr_cpus_avail, MAX_NR_CPUS);
for (i = 0; i < PERF_TYPE_MAX; ++i) {
struct evsel *evsel;