From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757186AbcJ3Apv (ORCPT ); Sat, 29 Oct 2016 20:45:51 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:32884 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755749AbcJ3AkQ (ORCPT ); Sat, 29 Oct 2016 20:40:16 -0400 From: David Carrillo-Cisneros To: linux-kernel@vger.kernel.org Cc: "x86@kernel.org" , Ingo Molnar , Thomas Gleixner , Andi Kleen , Kan Liang , Peter Zijlstra , Vegard Nossum , Marcelo Tosatti , Nilay Vaish , Borislav Petkov , Vikas Shivappa , Ravi V Shankar , Fenghua Yu , Paul Turner , Stephane Eranian , David Carrillo-Cisneros Subject: [PATCH v3 21/46] perf/x86/intel/cmt: use newly introduced event_terminate Date: Sat, 29 Oct 2016 17:38:18 -0700 Message-Id: <1477787923-61185-22-git-send-email-davidcc@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1477787923-61185-1-git-send-email-davidcc@google.com> References: <1477787923-61185-1-git-send-email-davidcc@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The change from event_destroy to event_terminate allows to check if the event is a event cgroup during event destuction, before generic code clears event->cgrp. Signed-off-by: David Carrillo-Cisneros --- arch/x86/events/intel/cmt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/intel/cmt.c b/arch/x86/events/intel/cmt.c index a5b7d2d..f7da8cf 100644 --- a/arch/x86/events/intel/cmt.c +++ b/arch/x86/events/intel/cmt.c @@ -1349,7 +1349,7 @@ static int intel_cmt_event_add(struct perf_event *event, int mode) return 0; } -static void intel_cmt_event_destroy(struct perf_event *event) +static void intel_cmt_event_terminate(struct perf_event *event) { struct monr *monr; @@ -1385,8 +1385,6 @@ static int intel_cmt_event_init(struct perf_event *event) event->attr.sample_period) /* no sampling */ return -EINVAL; - event->destroy = intel_cmt_event_destroy; - INIT_LIST_HEAD(&event->hw.cmt_list); mutex_lock(&cmt_mutex); @@ -1439,6 +1437,7 @@ static struct pmu intel_cmt_pmu = { .attr_groups = intel_cmt_attr_groups, .task_ctx_nr = perf_sw_context, .event_init = intel_cmt_event_init, + .event_terminate = intel_cmt_event_terminate, .add = intel_cmt_event_add, .del = intel_cmt_event_stop, .start = intel_cmt_event_start, -- 2.8.0.rc3.226.g39d4020