wrapper/perf.h: Fix kernel version condition

[lttng-modules.git] / wrapper / perf.h

diff --git a/wrapper/perf.h b/wrapper/perf.h
index 2caf308ab0abc6711070e0f796e337db1c607852..5de205cdda1eec77f60d0616a9fe6296a11300cf 100644 (file)
--- a/wrapper/perf.h
+++ b/wrapper/perf.h
@@ -32,7 +32,9 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
 {
        return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL);
 }
-#else
+#else /* defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99)) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
 static inline struct perf_event *
 wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
                                int cpu,
@@ -41,6 +43,29 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
 {
        return perf_event_create_kernel_counter(attr, cpu, task, callback);
 }
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */
+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)
+{
+       pid_t pid;
+
+       if (!task)
+               pid = -1;
+       else
+               pid = task->pid;
+
+       return perf_event_create_kernel_counter(attr, cpu, pid, callback);
+}
+
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36))
+#define local64_read(l)                atomic64_read(l)
 #endif
 
+#endif /* defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99)) */
+
 #endif /* _LTTNG_WRAPPER_PERF_H */