From 0e41488f1d347fe2f4988acc4b7c63ee02fe4026 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 18 Nov 2022 12:27:19 -0500 Subject: [PATCH] Drop 'linux/perf_events.h' wrapper Change-Id: Id4be9d9fbb70aa8213b12b2073a847cb81238993 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/wrapper/perf.h | 37 ------------------------------- src/lttng-context-perf-counters.c | 13 +++++------ 2 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 include/wrapper/perf.h diff --git a/include/wrapper/perf.h b/include/wrapper/perf.h deleted file mode 100644 index 737e3b38..00000000 --- a/include/wrapper/perf.h +++ /dev/null @@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) - * - * wrapper/perf.h - * - * Copyright (C) 2010-2012 Mathieu Desnoyers - */ - -#ifndef _LTTNG_WRAPPER_PERF_H -#define _LTTNG_WRAPPER_PERF_H - -#include - -#ifdef CONFIG_PERF_EVENTS - -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)) -static inline struct perf_event * -wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, - int cpu, - struct task_struct *task, - perf_overflow_handler_t callback) -{ - return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL); -} -#else /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)) */ -static inline struct perf_event * -wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, - int cpu, - struct task_struct *task, - perf_overflow_handler_t callback) -{ - return perf_event_create_kernel_counter(attr, cpu, task, callback); -} -#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,1,0)) */ - -#endif /* CONFIG_PERF_EVENTS */ - -#endif /* _LTTNG_WRAPPER_PERF_H */ diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c index 372f05e0..ac79d3ee 100644 --- a/src/lttng-context-perf-counters.c +++ b/src/lttng-context-perf-counters.c @@ -18,7 +18,6 @@ #include #include #include -#include #include static @@ -126,8 +125,8 @@ int lttng_cpuhp_perf_counter_online(unsigned int cpu, struct perf_event_attr *attr = perf_field->attr; struct perf_event *pevent; - pevent = wrapper_perf_event_create_kernel_counter(attr, - cpu, NULL, overflow_callback); + pevent = perf_event_create_kernel_counter(attr, + cpu, NULL, overflow_callback, NULL); if (!pevent || IS_ERR(pevent)) return -EINVAL; if (pevent->state == PERF_EVENT_STATE_ERROR) { @@ -188,8 +187,8 @@ int lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb, switch (action) { case CPU_ONLINE: case CPU_ONLINE_FROZEN: - pevent = wrapper_perf_event_create_kernel_counter(attr, - cpu, NULL, overflow_callback); + pevent = perf_event_create_kernel_counter(attr, + cpu, NULL, overflow_callback, NULL); if (!pevent || IS_ERR(pevent)) return NOTIFY_BAD; if (pevent->state == PERF_EVENT_STATE_ERROR) { @@ -307,8 +306,8 @@ int lttng_add_perf_counter_to_ctx(uint32_t type, #endif lttng_cpus_read_lock(); for_each_online_cpu(cpu) { - events[cpu] = wrapper_perf_event_create_kernel_counter(attr, - cpu, NULL, overflow_callback); + events[cpu] = perf_event_create_kernel_counter(attr, + cpu, NULL, overflow_callback, NULL); if (!events[cpu] || IS_ERR(events[cpu])) { ret = -EINVAL; goto counter_error; -- 2.34.1