X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Flock.h;h=ff7f7eeda99888b8b24555959a2fb9030061bb32;hb=134984e912082ad82437514f07e21f31b46f61f9;hp=3e5d68a56f1c4cd55b48c7071de903ba99c09a62;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/lock.h b/instrumentation/events/lttng-module/lock.h
index 3e5d68a5..ff7f7eed 100644
--- a/instrumentation/events/lttng-module/lock.h
+++ b/instrumentation/events/lttng-module/lock.h
@@ -15,7 +15,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 +31,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 +46,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 +86,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 +102,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 +117,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 +134,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>