From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932837AbcGHOGj (ORCPT ); Fri, 8 Jul 2016 10:06:39 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:53310 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932749AbcGHOFi (ORCPT ); Fri, 8 Jul 2016 10:05:38 -0400 Message-Id: <20160708134113.516894744@infradead.org> User-Agent: quilt/0.63-1 Date: Fri, 08 Jul 2016 15:31:03 +0200 From: Peter Zijlstra To: mingo@kernel.org, acme@kernel.org, linux-kernel@vger.kernel.org Cc: andi@firstfloor.org, eranian@google.com, jolsa@kernel.org, torvalds@linux-foundation.org, davidcc@google.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, kan.liang@intel.com, khandual@linux.vnet.ibm.com, peterz@infradead.org Subject: [RFC][PATCH 4/7] perf/x86/intel: Remove redundant test from intel_pmu_lbr_add() References: <20160708133059.031522978@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-perf-frob-lbr-2.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org By the time we call pmu::add(), event->ctx must be set, and we even already rely on this, so remove that test from intel_pmu_lbr_add(). Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/events/intel/lbr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -440,8 +440,7 @@ void intel_pmu_lbr_add(struct perf_event } cpuc->br_sel = event->hw.branch_reg.reg; - if (branch_user_callstack(cpuc->br_sel) && event->ctx && - event->ctx->task_ctx_data) { + if (branch_user_callstack(cpuc->br_sel) && event->ctx->task_ctx_data) { task_ctx = event->ctx->task_ctx_data; task_ctx->lbr_callstack_users++; }