Namespace kernel version macros

[lttng-modules.git] / probes / lttng-probe-lock.c

diff --git a/probes/lttng-probe-lock.c b/probes/lttng-probe-lock.c
index b95e0c58a4b2ca68b7a1d75f1da5134b84e98052..94ed167830b44a0c63e0973bc7e597affd88ef49 100644 (file)
--- a/probes/lttng-probe-lock.c
+++ b/probes/lttng-probe-lock.c
@@ -22,29 +22,34 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
+#include <lttng-tracer.h>
 
 /*
  * Create the tracepoint static inlines from the kernel to validate that our
  * trace event macros match the kernel we run on.
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,33))
 #include <trace/events/lock.h>
 #else
 #include <trace/events/lockdep.h>
 #endif
 
-#include "../wrapper/tracepoint.h"
+#include <wrapper/tracepoint.h>
 
 /*
  * Create LTTng tracepoint probes.
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 
-#include "../instrumentation/events/lttng-module/lock.h"
+#include <instrumentation/events/lttng-module/lock.h>
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Wade Farnsworth <wade_farnsworth@mentor.com> and Andrew Gabbasov <andrew_gabbasov@mentor.com>");
 MODULE_DESCRIPTION("LTTng lock probes");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
+       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+       LTTNG_MODULES_EXTRAVERSION);