summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-19 08:41:59 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-19 08:41:59 +0200
commita19cad6d66823ddd54b0e7c88d7bddd307cb1161 (patch)
tree5730a60bcd7400c3c02f7e51320542adc00c443b /tools
parentc3b46c73264b03000d1e18b22f5caf63332547c9 (diff)
parent1342e0b7a6c1a060c593037fbac9f4b717f1cb3b (diff)
downloadlinux-sh-a19cad6d66823ddd54b0e7c88d7bddd307cb1161.tar.gz
Merge tag 'perf-urgent-for-mingo-20160418' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull a perf/urgent fix from Arnaldo Carvalho de Melo: - Fix segfault tracing transactions in Intel PT (Adrian Hunter) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/intel-pt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 407f11b97c8d..617578440989 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1130,7 +1130,7 @@ static int intel_pt_synth_transaction_sample(struct intel_pt_queue *ptq)
pr_err("Intel Processor Trace: failed to deliver transaction event, error %d\n",
ret);
- if (pt->synth_opts.callchain)
+ if (pt->synth_opts.last_branch)
intel_pt_reset_last_branch_rb(ptq);
return ret;