diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-09-16 09:19:56 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-09-16 09:19:56 +0200 |
commit | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 (patch) | |
tree | 347c773357c1afc87d65f767258317164bc0e31e /tools/perf/util/header.c | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
download | linux-dev-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.xz linux-dev-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.zip |
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
Conflicts:
tools/perf/ui/browsers/hists.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/header.c')
-rw-r--r-- | tools/perf/util/header.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 6d8fa543dcff..43838003c1a1 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1431,7 +1431,7 @@ static int process_nrcpus(struct perf_file_section *section __maybe_unused, if (ph->needs_swap) nr = bswap_32(nr); - ph->env.nr_cpus_online = nr; + ph->env.nr_cpus_avail = nr; ret = readn(fd, &nr, sizeof(nr)); if (ret != sizeof(nr)) @@ -1440,7 +1440,7 @@ static int process_nrcpus(struct perf_file_section *section __maybe_unused, if (ph->needs_swap) nr = bswap_32(nr); - ph->env.nr_cpus_avail = nr; + ph->env.nr_cpus_online = nr; return 0; } |