Drop 'linux/perf_events.h' wrapper

Change-Id: Id4be9d9fbb70aa8213b12b2073a847cb81238993
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/wrapper/perf.h b/include/wrapper/perf.h
deleted file mode 100644 (file)
index 737e3b3..0000000
--- 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 <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_PERF_H
-#define _LTTNG_WRAPPER_PERF_H
-
-#include <linux/perf_event.h>
-
-#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 372f05e0cc902c311611604875d6922372c1dc48..ac79d3eeb72872f998989a9296f3c246ba831d9d 100644 (file)
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -18,7 +18,6 @@
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/cpu.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/perf.h>
 #include <lttng/tracer.h>
 
 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;