diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2016-07-07 19:37:52 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2016-08-10 13:13:25 +0200 |
| commit | c3a61a2c5c6b6b4dd878812507c681c9aec3ed17 (patch) | |
| tree | 397b17097f2d4eba42081d2c323f57447eb29e74 /arch/x86/events/intel/lbr.c | |
| parent | perf/x86: Ensure perf_sched_cb_{inc,dec}() is only called from pmu::{add,del}() (diff) | |
| download | linux-dev-c3a61a2c5c6b6b4dd878812507c681c9aec3ed17.tar.xz linux-dev-c3a61a2c5c6b6b4dd878812507c681c9aec3ed17.zip | |
perf/x86/intel: Eliminate dead code in intel_pmu_lbr_del()
Since pmu::del() is always called under perf_pmu_disable(), the block
conditional on cpuc->enabled is dead.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel/lbr.c')
| -rw-r--r-- | arch/x86/events/intel/lbr.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index e7b58c2c2250..1bd72e900498 100644 --- 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 *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) |