From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932780AbcGHOFr (ORCPT ); Fri, 8 Jul 2016 10:05:47 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:53301 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932660AbcGHOFa (ORCPT ); Fri, 8 Jul 2016 10:05:30 -0400 Message-Id: <20160708134113.450714174@infradead.org> User-Agent: quilt/0.63-1 Date: Fri, 08 Jul 2016 15:31:02 +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 3/7] perf/x86/intel: DCE intel_pmu_lbr_del() References: <20160708133059.031522978@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-perf-frob-lbr-1.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since pmu::del() is always called under perf_pmu_disable(), the block conditional on cpuc->enabled is dead. Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/events/intel/lbr.c | 6 ------ 1 file changed, 6 deletions(-) --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -467,12 +467,6 @@ void intel_pmu_lbr_del(struct perf_event cpuc->lbr_users--; WARN_ON_ONCE(cpuc->lbr_users < 0); perf_sched_cb_dec(event->ctx->pmu); - - if (cpuc->enabled && !cpuc->lbr_users) { - __intel_pmu_lbr_disable(); - /* avoid stale pointer */ - cpuc->lbr_context = NULL; - } } void intel_pmu_lbr_enable_all(bool pmi)