From: Frederic Weisbecker <[email protected]> This disambiguates the function names as we prepare to split the event allocation and initialization codes.
Signed-off-by: Frederic Weisbecker <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

