diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-23 15:12:10 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-23 15:12:10 +0300 |
| commit | 65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch) | |
| tree | 02b22c99008630010f28f45f502f55915f1014c2 /tools/perf/util/intel-pt.c | |
| parent | 9243ae5b28d02dc7d71a4f00c981ef6feaede3f1 (diff) | |
| parent | b303e7c15d53cd8ef6b349b702e07eee3f102792 (diff) | |
| download | linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/intel-pt.c')
| -rw-r--r-- | tools/perf/util/intel-pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c index ddec87f6e616..137196990012 100644 --- a/tools/perf/util/intel-pt.c +++ b/tools/perf/util/intel-pt.c @@ -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; |