[tip:perf/core] perf intel-pt: Join needlessly wrapped lines
From: tip-bot for Adrian Hunter
Date: Sat Jul 01 2017 - 04:55:26 EST
Commit-ID: 406a180501f6d0d4e43d5acc5f580abfc95c742d
Gitweb: http://git.kernel.org/tip/406a180501f6d0d4e43d5acc5f580abfc95c742d
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
AuthorDate: Fri, 26 May 2017 11:17:29 +0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Fri, 30 Jun 2017 11:44:34 -0300
perf intel-pt: Join needlessly wrapped lines
Join needlessly wrapped lines.
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1495786658-18063-29-git-send-email-adrian.hunter@xxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/intel-pt.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index f8237a0..b670502 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1298,15 +1298,13 @@ static int intel_pt_sample(struct intel_pt_queue *ptq)
ptq->have_sample = false;
- if (pt->sample_instructions &&
- (state->type & INTEL_PT_INSTRUCTION)) {
+ if (pt->sample_instructions && (state->type & INTEL_PT_INSTRUCTION)) {
err = intel_pt_synth_instruction_sample(ptq);
if (err)
return err;
}
- if (pt->sample_transactions &&
- (state->type & INTEL_PT_TRANSACTION)) {
+ if (pt->sample_transactions && (state->type & INTEL_PT_TRANSACTION)) {
err = intel_pt_synth_transaction_sample(ptq);
if (err)
return err;