From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752500AbdGAIzW (ORCPT ); Sat, 1 Jul 2017 04:55:22 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59859 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751753AbdGAIzU (ORCPT ); Sat, 1 Jul 2017 04:55:20 -0400 Date: Sat, 1 Jul 2017 01:53:12 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: tglx@linutronix.de, ak@linux.intel.com, adrian.hunter@intel.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, ak@linux.intel.com, adrian.hunter@intel.com, mingo@kernel.org In-Reply-To: <1495786658-18063-29-git-send-email-adrian.hunter@intel.com> References: <1495786658-18063-29-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf intel-pt: Join needlessly wrapped lines Git-Commit-ID: 406a180501f6d0d4e43d5acc5f580abfc95c742d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 406a180501f6d0d4e43d5acc5f580abfc95c742d Gitweb: http://git.kernel.org/tip/406a180501f6d0d4e43d5acc5f580abfc95c742d Author: Adrian Hunter AuthorDate: Fri, 26 May 2017 11:17:29 +0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Andi Kleen Link: http://lkml.kernel.org/r/1495786658-18063-29-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- 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;