X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fperf.h;fp=wrapper%2Fperf.h;h=6bd2a5d59cfe026f7bf9476f730dd4d20743e4f2;hb=397f5ba19a87294c2cbcf4e037ebfbb9cbd28c91;hp=5de205cdda1eec77f60d0616a9fe6296a11300cf;hpb=180b516533d695812b1cfa0280c78ff7c41b260c;p=lttng-modules.git

diff --git a/wrapper/perf.h b/wrapper/perf.h
index 5de205cd..6bd2a5d5 100644
--- a/wrapper/perf.h
+++ b/wrapper/perf.h
@@ -23,7 +23,9 @@
 
 #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,
@@ -32,7 +34,7 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
 {
 	return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL);
 }
-#else /* defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99)) */
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
 static inline struct perf_event *
@@ -66,6 +68,8 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
 #define local64_read(l)		atomic64_read(l)
 #endif
 
-#endif /* defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99)) */
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */
+
+#endif /* CONFIG_PERF_EVENTS */
 
 #endif /* _LTTNG_WRAPPER_PERF_H */