From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754493AbbBRRqW (ORCPT ); Wed, 18 Feb 2015 12:46:22 -0500 Received: from mail-ig0-f181.google.com ([209.85.213.181]:43342 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754475AbbBRRqU (ORCPT ); Wed, 18 Feb 2015 12:46:20 -0500 From: David Ahern To: linux-kernel@vger.kernel.org Cc: David Ahern , Peter Zijlstra Subject: [PATCH] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able Date: Wed, 18 Feb 2015 10:45:43 -0700 Message-Id: <1424281543-67335-1-git-send-email-dsahern@gmail.com> X-Mailer: git-send-email 1.9.3 (Apple Git-50) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org perf_pmu_disable is called before pmu->add and perf_pmu_enable is called afterwards. No need to call these inside of x86_pmu_add as well. Signed-off-by: David Ahern Cc: Peter Zijlstra --- arch/x86/kernel/cpu/perf_event.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index b71a7f86d68a..2d1675816bef 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1033,7 +1033,6 @@ static int x86_pmu_add(struct perf_event *event, int flags) hwc = &event->hw; - perf_pmu_disable(event->pmu); n0 = cpuc->n_events; ret = n = collect_events(cpuc, event, false); if (ret < 0) @@ -1071,7 +1070,6 @@ static int x86_pmu_add(struct perf_event *event, int flags) ret = 0; out: - perf_pmu_enable(event->pmu); return ret; } -- 1.9.3 (Apple Git-50)