projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compile error on kernel 3.0.101 with CONFIG_PERF_EVENTS
[lttng-modules.git]
/
wrapper
/
perf.h
diff --git
a/wrapper/perf.h
b/wrapper/perf.h
index 5de205cdda1eec77f60d0616a9fe6296a11300cf..6bd2a5d59cfe026f7bf9476f730dd4d20743e4f2 100644
(file)
--- a/
wrapper/perf.h
+++ b/
wrapper/perf.h
@@
-23,7
+23,9
@@
#include <linux/perf_event.h>
#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,
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);
}
{
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 *
#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
#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 */
#endif /* _LTTNG_WRAPPER_PERF_H */
This page took
0.023699 seconds
and
4
git commands to generate.