aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/arch
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-07-08 13:49:15 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-07-08 13:49:15 -0300
commitfacbf0b9820f34f14b54f567862b4a96e910f468 (patch)
treeee65e875e4167dd903f2745cfbf6b2735fd1cd9e /tools/perf/arch
parentperf symbols: Add s390 idle functions 'psw_idle' and 'psw_idle_exit' to list of idle symbols (diff)
parentMerge tag 'perf-tools-fixes-2020-07-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux (diff)
downloadlinux-dev-facbf0b9820f34f14b54f567862b4a96e910f468.tar.xz
linux-dev-facbf0b9820f34f14b54f567862b4a96e910f468.zip
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and move perf/core forward, minor conflict as perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a 'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/ specific, it is not in libperf. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/arch')
-rw-r--r--tools/perf/arch/x86/util/intel-pt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index 839ef52c1ac2..6ce451293634 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -641,6 +641,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
}
evsel->core.attr.freq = 0;
evsel->core.attr.sample_period = 1;
+ evsel->no_aux_samples = true;
intel_pt_evsel = evsel;
opts->full_auxtrace = true;
}