From: David Engraf <david.engraf@sysgo.com>
Date: Thu, 18 Dec 2014 10:45:22 +0000 (+0100)
Subject: Fix compile error on kernel 3.0.101 with CONFIG_PERF_EVENTS
X-Git-Tag: v2.7.0-rc1~96
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=bed5dbd4337cd58957c59d74ac252935c4a7dccc;p=lttng-modules.git

Fix compile error on kernel 3.0.101 with CONFIG_PERF_EVENTS

The context parameter of perf_event_create_kernel_counter() was introduced
with kernel 3.1.

Signed-off-by: David Engraf <david.engraf@sysgo.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

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 */