Cleanup: move to kernel style SPDX license identifiers

[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 3e5d68a56f1c4cd55b48c7071de903ba99c09a62..49e78113d5eeda5b7e8e9d87d9432a7e694ebefa 100644 (file)
--- a/instrumentation/events/lttng-module/lock.h
+++ b/instrumentation/events/lttng-module/lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/version.h>
 
 #undef TRACE_SYSTEM
@@ -15,7 +16,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
 
@@ -31,7 +32,7 @@ LTTNG_TRACEPOINT_EVENT(lock_acquire,
                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))
-               ctf_integer(void *, lockdep_addr, lock)
+               ctf_integer_hex(void *, lockdep_addr, lock)
 #endif
        )
 )
@@ -46,7 +47,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(lock,
 
        TP_FIELDS(
                ctf_string(name, lock->name)
-               ctf_integer(void *, lockdep_addr, lock)
+               ctf_integer_hex(void *, lockdep_addr, lock)
        )
 )
 
@@ -86,7 +87,7 @@ LTTNG_TRACEPOINT_EVENT(lock_release,
        TP_FIELDS(
                ctf_string(name, lock->name)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
-               ctf_integer(void *, lockdep_addr, lock)
+               ctf_integer_hex(void *, lockdep_addr, lock)
 #endif
        )
 )
@@ -102,7 +103,7 @@ LTTNG_TRACEPOINT_EVENT(lock_contended,
        TP_FIELDS(
                ctf_string(name, lock->name)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
-               ctf_integer(void *, lockdep_addr, lock)
+               ctf_integer_hex(void *, lockdep_addr, lock)
 #endif
        )
 )
@@ -117,7 +118,7 @@ LTTNG_TRACEPOINT_EVENT(lock_acquired,
                ctf_string(name, lock->name)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
                ctf_integer(s64, wait_nsec, wait_nsec)
-               ctf_integer(void *, lockdep_addr, lock)
+               ctf_integer_hex(void *, lockdep_addr, lock)
 #else
                ctf_integer(unsigned long, wait_usec, (unsigned long) waittime)
                ctf_integer(unsigned long, wait_nsec_rem, do_div(waittime, NSEC_PER_USEC))
@@ -134,4 +135,4 @@ LTTNG_TRACEPOINT_EVENT(lock_acquired,
 #endif /* LTTNG_TRACE_LOCK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>