X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=22f654be96d4a92ad5c68b80d24fcb372ad0bfc8;hb=02060928919e1efc07228be0fc0b77a6b1406156;hp=e5237bb0776611674a05d6a17e12aa4d7889a41d;hpb=4697aac7ad1bdb932a843d93076418f4048baad3;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index e5237bb0..22f654be 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -16,7 +16,8 @@
 #include <linux/kref.h>
 #include <linux/uuid.h>
 #include <linux/irq_work.h>
-#include <wrapper/uprobes.h>
+#include <linux/uprobes.h>
+
 #include <lttng/cpuhotplug.h>
 #include <lttng/tracer.h>
 #include <lttng/abi.h>
@@ -163,11 +164,10 @@ struct lttng_kernel_event_field {
 	_lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, 1, _base)
 
 #define _lttng_kernel_static_type_integer_from_type(_type, _byte_order, _user, _base)			\
-	lttng_kernel_static_type_integer(sizeof(_type) * CHAR_BIT,					\
+	_lttng_kernel_static_type_integer(sizeof(_type) * CHAR_BIT,					\
 			lttng_alignof(_type) * CHAR_BIT,						\
 			lttng_is_signed_type(_type),							\
-			_byte_order,									\
-			_base)
+			_byte_order, _user, _base)
 
 #define lttng_kernel_static_type_integer_from_type(_type, _byte_order, _base)				\
 	_lttng_kernel_static_type_integer_from_type(_type, _byte_order, 0, _base)