>From bed03bd7571b7b54d6b7af832f618d3b4faa7bdb Mon Sep 17 00:00:00 2001 From: David Engraf <[email protected]> Date: Thu, 18 Dec 2014 11:45:22 +0100 Subject: [PATCH] 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 <[email protected]> --- wrapper/perf.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wrapper/perf.h b/wrapper/perf.h index 5de205c..6bd2a5d 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 */ -- 1.9.1
_______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
