From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755490AbcIELyw (ORCPT ); Mon, 5 Sep 2016 07:54:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36334 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755337AbcIELys (ORCPT ); Mon, 5 Sep 2016 07:54:48 -0400 Date: Mon, 5 Sep 2016 04:53:07 -0700 From: tip-bot for Will Deacon Message-ID: Cc: acme@redhat.com, will.deacon@arm.com, eranian@google.com, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, jolsa@redhat.com, mingo@kernel.org, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, jolsa@redhat.com, acme@redhat.com, eranian@google.com, will.deacon@arm.com, hpa@zytor.com In-Reply-To: <1471257765-29662-1-git-send-email-will.deacon@arm.com> References: <1471257765-29662-1-git-send-email-will.deacon@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Don't pass PERF_EF_START to the PMU ->start callback Git-Commit-ID: c9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a 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: c9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a Gitweb: http://git.kernel.org/tip/c9bbdd4830ab06288bb1d8c00ed8c8c6e80e377a Author: Will Deacon AuthorDate: Mon, 15 Aug 2016 11:42:45 +0100 Committer: Ingo Molnar CommitDate: Mon, 5 Sep 2016 13:19:18 +0200 perf/core: Don't pass PERF_EF_START to the PMU ->start callback PERF_EF_START is a flag to indicate to the PMU ->add() callback that, as well as claiming the PMU resources required by the event being added, it should also start the PMU. Passing this flag to the ->start() callback doesn't make sense, because ->start() always tries to start the PMU. Remove it. Signed-off-by: Will Deacon Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: mark.rutland@arm.com Link: http://lkml.kernel.org/r/1471257765-29662-1-git-send-email-will.deacon@arm.com Signed-off-by: Ingo Molnar --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index dff00c7..74f22a9 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2492,7 +2492,7 @@ static int __perf_event_stop(void *info) * while restarting. */ if (sd->restart) - event->pmu->start(event, PERF_EF_START); + event->pmu->start(event, 0); return 0; }