X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fperf.h;h=6bd2a5d59cfe026f7bf9476f730dd4d20743e4f2;hb=refs%2Fheads%2Fstable-2.7;hp=d774d4abbb5bce28e222acd50a060e3b7e8ba0bd;hpb=a90917c3f8c4ed79117f1caa333b29a2108084ec;p=lttng-modules.git

diff --git a/wrapper/perf.h b/wrapper/perf.h
index d774d4ab..6bd2a5d5 100644
--- a/wrapper/perf.h
+++ b/wrapper/perf.h
@@ -2,14 +2,30 @@
 #define _LTTNG_WRAPPER_PERF_H
 
 /*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+ * wrapper/perf.h
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/perf_event.h>
 
-#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99))
+#ifdef CONFIG_PERF_EVENTS
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
 static inline struct perf_event *
 wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
 				int cpu,
@@ -18,7 +34,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 /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */
+
+#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,
@@ -27,6 +45,31 @@ 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 /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */
+
+#endif /* CONFIG_PERF_EVENTS */
+
 #endif /* _LTTNG_WRAPPER_PERF_H */