X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Fperf.h;h=5de205cdda1eec77f60d0616a9fe6296a11300cf;hb=40d6e366189861b779fcc012f10a5abebebf5ea9;hp=5dfa84b388ec2262030de819b208f5f83c9de065;hpb=3a523f5b6b4f8ca82412cb45f2d2ad9c44e7d249;p=lttng-modules.git diff --git a/wrapper/perf.h b/wrapper/perf.h index 5dfa84b3..5de205cd 100644 --- a/wrapper/perf.h +++ b/wrapper/perf.h @@ -34,7 +34,7 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, } #else /* defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99)) */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) +#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, @@ -43,7 +43,7 @@ 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,36)) */ +#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, @@ -60,8 +60,11 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, 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 /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) */ +#endif #endif /* defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99)) */