Cleanup: Move lttng-modules instrumentation headers

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

diff --git a/probes/lttng-probe-lock.c b/probes/lttng-probe-lock.c
index b3ad230204e7f1f897ca62dfbda5cebb0ad3a85f..2ab91385b4e44551cbfd7977d0e12c483cc3f5f3 100644 (file)
--- a/probes/lttng-probe-lock.c
+++ b/probes/lttng-probe-lock.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * probes/lttng-probe-lock.c
  *
@@ -10,18 +10,13 @@
 
 #include <linux/module.h>
 #include <linux/version.h>
-#include <lttng-tracer.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))
 #include <trace/events/lock.h>
-#else
-#include <trace/events/lockdep.h>
-#endif
-
 #include <wrapper/tracepoint.h>
 
 /*
@@ -29,9 +24,9 @@
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events
 
-#include <instrumentation/events/lttng-module/lock.h>
+#include <instrumentation/events/lock.h>
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Wade Farnsworth <wade_farnsworth@mentor.com> and Andrew Gabbasov <andrew_gabbasov@mentor.com>");