Fix: 4.1-rc1 Linux build and regmap instrumentation

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

diff --git a/probes/lttng-probe-regmap.c b/probes/lttng-probe-regmap.c
index 8850b55abe6629f70ab9023a547b8379e4331ad7..c51924a0f2c414db783864f3113af6dfd12c1a35 100644 (file)
--- a/probes/lttng-probe-regmap.c
+++ b/probes/lttng-probe-regmap.c
@@ -23,13 +23,22 @@
 
 #include <linux/module.h>
 #include <linux/device.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(4,1,0))
+#include <../../drivers/base/regmap/trace.h>
+
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+
+#else  /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
 #include <trace/events/regmap.h>
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
 
 /*
  * Create LTTng tracepoint probes.