diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2017-05-26 04:17:29 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-30 10:44:34 -0400 |
commit | 406a180501f6d0d4e43d5acc5f580abfc95c742d (patch) | |
tree | 6dfa0c048f23cced4544c484fb5ed517d8c06f60 | |
parent | f90d07a9f6d76e46ed99b4103747031394b16dd7 (diff) |
perf intel-pt: Join needlessly wrapped lines
Join needlessly wrapped lines.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1495786658-18063-29-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/util/intel-pt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c index f8237a0e2946..b670502b0264 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) | |||
1298 | 1298 | ||
1299 | ptq->have_sample = false; | 1299 | ptq->have_sample = false; |
1300 | 1300 | ||
1301 | if (pt->sample_instructions && | 1301 | if (pt->sample_instructions && (state->type & INTEL_PT_INSTRUCTION)) { |
1302 | (state->type & INTEL_PT_INSTRUCTION)) { | ||
1303 | err = intel_pt_synth_instruction_sample(ptq); | 1302 | err = intel_pt_synth_instruction_sample(ptq); |
1304 | if (err) | 1303 | if (err) |
1305 | return err; | 1304 | return err; |
1306 | } | 1305 | } |
1307 | 1306 | ||
1308 | if (pt->sample_transactions && | 1307 | if (pt->sample_transactions && (state->type & INTEL_PT_TRANSACTION)) { |
1309 | (state->type & INTEL_PT_TRANSACTION)) { | ||
1310 | err = intel_pt_synth_transaction_sample(ptq); | 1308 | err = intel_pt_synth_transaction_sample(ptq); |
1311 | if (err) | 1309 | if (err) |
1312 | return err; | 1310 | return err; |