From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932591AbcFCVEE (ORCPT ); Fri, 3 Jun 2016 17:04:04 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45334 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752887AbcFCVDw (ORCPT ); Fri, 3 Jun 2016 17:03:52 -0400 From: Neil Leeder To: Catalin Marinas , WillDeacon , Mark Rutland , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Langsdorf , Mark Salter , Jon Masters , Timur Tabi , cov@codeaurora.org, Neil Leeder Subject: [PATCH 1/2] perf: allow add to change event state Date: Fri, 3 Jun 2016 17:03:31 -0400 Message-Id: <1464987812-14360-2-git-send-email-nleeder@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464987812-14360-1-git-send-email-nleeder@codeaurora.org> References: <1464987812-14360-1-git-send-email-nleeder@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the platform-specific pmu->add function returns an error, it may have also changed the event's state. If so, do not override that new state. Signed-off-by: Neil Leeder --- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index c0ded24..95c4cf3d3 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -1952,7 +1952,8 @@ event_sched_in(struct perf_event *event, perf_log_itrace_start(event); if (event->pmu->add(event, PERF_EF_START)) { - event->state = PERF_EVENT_STATE_INACTIVE; + if (event->state == PERF_EVENT_STATE_ACTIVE) + event->state = PERF_EVENT_STATE_INACTIVE; event->oncpu = -1; ret = -EAGAIN; goto out; -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.