From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbbC0Lqj (ORCPT ); Fri, 27 Mar 2015 07:46:39 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37307 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbbC0Lqe (ORCPT ); Fri, 27 Mar 2015 07:46:34 -0400 Date: Fri, 27 Mar 2015 04:46:06 -0700 From: tip-bot for David Ahern Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, dsahern@gmail.com, mingo@kernel.org, peterz@infradead.org Reply-To: dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org In-Reply-To: <1424281543-67335-1-git-send-email-dsahern@gmail.com> References: <1424281543-67335-1-git-send-email-dsahern@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Remove redundant calls to perf_pmu_{dis|en}able() Git-Commit-ID: 9332d250b4b4f67c633894b311e022e3cf943bd5 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: 9332d250b4b4f67c633894b311e022e3cf943bd5 Gitweb: http://git.kernel.org/tip/9332d250b4b4f67c633894b311e022e3cf943bd5 Author: David Ahern AuthorDate: Wed, 18 Feb 2015 10:45:43 -0700 Committer: Ingo Molnar CommitDate: Fri, 27 Mar 2015 09:49:44 +0100 perf/x86: Remove redundant calls to perf_pmu_{dis|en}able() 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 Signed-off-by: Peter Zijlstra (Intel) Link: http://lkml.kernel.org/r/1424281543-67335-1-git-send-email-dsahern@gmail.com Signed-off-by: Ingo Molnar --- 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 ec6e982..ac41b3a 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1044,7 +1044,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) @@ -1082,7 +1081,6 @@ done_collect: ret = 0; out: - perf_pmu_enable(event->pmu); return ret; }