iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core, to resolve conflict

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2016-04-23 14:12:10 +02:00
parent 9243ae5b28 b303e7c15d
commit 65cbbd037b
176 changed files with 1305 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/intel-pt.c
View File

@ -1144,7 +1144,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;