diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-20 14:35:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-20 14:35:31 -0300 |
| commit | cd07e536b0201fceffd90a701bfb1e1fc07fcd34 (patch) | |
| tree | 4777d4b2f749b279fc07bd41f11b88c9e4578afe /tools/perf/util/session.c | |
| parent | 47fddcb479e73c341fb414e40a89572dacadd360 (diff) | |
| parent | 45dfb8a5659ad286c28fa59008271dbc4e5e3f2d (diff) | |
| download | cachepc-linux-cd07e536b0201fceffd90a701bfb1e1fc07fcd34.tar.gz cachepc-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.c | 2 |
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; |