diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-08-23 10:29:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-08-23 10:29:19 +0200 |
| commit | 66e5db4a1ccc64f278653bc69dc406d184dc750a (patch) | |
| tree | 962c9c7debae59ced3401c38d6894d620f68693b /tools/perf/util/evlist.c | |
| parent | 5804b11034a21e4287daaf017c5ad60ad7af8d67 (diff) | |
| parent | 78303650e4cd873c6c4276c6fe3e768ff0b46d22 (diff) | |
| download | kernel_replicant_linux-66e5db4a1ccc64f278653bc69dc406d184dc750a.tar.gz kernel_replicant_linux-66e5db4a1ccc64f278653bc69dc406d184dc750a.tar.bz2 kernel_replicant_linux-66e5db4a1ccc64f278653bc69dc406d184dc750a.zip | |
Merge tag 'perf-core-for-mingo-4.19-20180820' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
LLVM/clang/eBPF: (Arnaldo Carvalho de Melo)
- Allow passing options to llc in addition to to clang.
Hardware tracing: (Jack Henschel)
- Improve error message for PMU address filters, clarifying availability of
that feature in hardware having hardware tracing such as Intel PT.
Python interface: (Jiri Olsa)
- Fix read_on_cpu() interface.
ELF/DWARF libraries: (Jiri Olsa)
- Fix handling of the combo compressed module file + decompressed associated
debuginfo file.
Build (Rasmus Villemoes)
- Disable parallelism for 'make clean', avoiding multiple submakes deleting
the same files and causing the build to fail on systems such as Yocto.
Kernel ABI copies: (Arnaldo Carvalho de Melo)
- Update tools's copy of x86's cpufeatures.h.
- Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy'.
Miscellaneous: (Steven Rostedt)
- Change libtraceevent to SPDX License format.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/evlist.c')
| -rw-r--r-- | tools/perf/util/evlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index e7a4b31a84fb..be440df29615 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -803,7 +803,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx, if (*output == -1) { *output = fd; - if (perf_mmap__mmap(&maps[idx], mp, *output) < 0) + if (perf_mmap__mmap(&maps[idx], mp, *output, evlist_cpu) < 0) return -1; } else { if (ioctl(fd, PERF_EVENT_IOC_SET_OUTPUT, *output) != 0) |