Namespace kernel version macros

[lttng-modules.git] / instrumentation / events / lttng-module / lock.h

diff --git a/instrumentation/events/lttng-module/lock.h b/instrumentation/events/lttng-module/lock.h
index 14d6a1ea9fb7356927ba11205ea1b722d6eb6e3e..7f7991860dcb343d33b295013a90ed7efc75e09a 100644 (file)
--- a/instrumentation/events/lttng-module/lock.h
+++ b/instrumentation/events/lttng-module/lock.h
@@ -1,7 +1,7 @@
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 
 #undef TRACE_SYSTEM
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,33))
 #define TRACE_SYSTEM lock
 #else
 #define TRACE_SYSTEM lockdep
@@ -15,7 +15,7 @@
 #define LTTNG_TRACE_LOCK_H
 
 #include <linux/lockdep.h>
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 
 #ifdef CONFIG_LOCKDEP
 
@@ -30,13 +30,13 @@ LTTNG_TRACEPOINT_EVENT(lock_acquire,
        TP_FIELDS(
                ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0))
                ctf_string(name, lock->name)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,34))
                ctf_integer_hex(void *, lockdep_addr, lock)
 #endif
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,35))
 
 LTTNG_TRACEPOINT_EVENT_CLASS(lock,
 
@@ -75,7 +75,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_acquired,
 
 #endif
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,35)) */
 
 LTTNG_TRACEPOINT_EVENT(lock_release,
 
@@ -85,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(lock_release,
 
        TP_FIELDS(
                ctf_string(name, lock->name)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,34))
                ctf_integer_hex(void *, lockdep_addr, lock)
 #endif
        )
@@ -101,7 +101,7 @@ LTTNG_TRACEPOINT_EVENT(lock_contended,
 
        TP_FIELDS(
                ctf_string(name, lock->name)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,34))
                ctf_integer_hex(void *, lockdep_addr, lock)
 #endif
        )
@@ -115,7 +115,7 @@ LTTNG_TRACEPOINT_EVENT(lock_acquired,
 
        TP_FIELDS(
                ctf_string(name, lock->name)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,34))
                ctf_integer(s64, wait_nsec, wait_nsec)
                ctf_integer_hex(void *, lockdep_addr, lock)
 #else
@@ -127,11 +127,11 @@ LTTNG_TRACEPOINT_EVENT(lock_acquired,
 
 #endif
 
-#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,35)) */
 
 #endif
 
 #endif /* LTTNG_TRACE_LOCK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>