X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-probe-regmap.c;h=c51924a0f2c414db783864f3113af6dfd12c1a35;hb=911f9f47ff18efe784faaf0d8476304d8435fd27;hp=8850b55abe6629f70ab9023a547b8379e4331ad7;hpb=cd041d0c2077c6d64a6aea6c1e76d186c9fe6f0f;p=lttng-modules.git

diff --git a/probes/lttng-probe-regmap.c b/probes/lttng-probe-regmap.c
index 8850b55a..c51924a0 100644
--- 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.