Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a19cad6d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-20160418' of... 

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c3b46c73 1342e0b7

tools/perf/util/intel-pt.c

+1 −1
Original line number Diff line number Diff line
@@ -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;