Merge tag 'perf-urgent-for-mingo-20160418' of git://git.kernel.org/pu…

…b/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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
akeromi · Apr 19, 2016 · a19cad6 · a19cad6
2 parents c3b46c7 + 1342e0b
commit a19cad6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;