Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755635Ab3IYMvb (ORCPT ); Wed, 25 Sep 2013 08:51:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37565 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755608Ab3IYMv3 (ORCPT ); Wed, 25 Sep 2013 08:51:29 -0400 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Corey Ashford , Frederic Weisbecker , Ingo Molnar , Paul Mackerras , Peter Zijlstra Subject: [PATCH 10/21] perf: Be more specific on pmu related event init naming Date: Wed, 25 Sep 2013 14:50:36 +0200 Message-Id: <1380113447-17144-11-git-send-email-jolsa@redhat.com> In-Reply-To: <1380113447-17144-1-git-send-email-jolsa@redhat.com> References: <1380113447-17144-1-git-send-email-jolsa@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1573 Lines: 48 From: Frederic Weisbecker This disambiguates the function names as we prepare to split the event allocation and initialization codes. Signed-off-by: Frederic Weisbecker Signed-off-by: Jiri Olsa Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo --- kernel/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 7df7a21..2a19b64 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6598,7 +6598,7 @@ void perf_pmu_unregister(struct pmu *pmu) free_pmu_context(pmu); } -struct pmu *perf_init_event(struct perf_event *event) +struct pmu *perf_pmu_init_event(struct perf_event *event) { struct pmu *pmu = NULL; int idx; @@ -6775,7 +6775,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, if (attr->inherit && (attr->read_format & PERF_FORMAT_GROUP)) goto err_ns; - pmu = perf_init_event(event); + pmu = perf_pmu_init_event(event); if (!pmu) goto err_ns; else if (IS_ERR(pmu)) { -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/