X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=d0b06f50e813a7b6461caa08f24b5b00ae064786;hb=066b83b8dfc562e00cb61d39eca0e0f77242828c;hp=0e0b466b994546337c61e3d95e7714837e8c49ad;hpb=7166e240639cec06f4273f65059300f98b5296f6;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 0e0b466..d0b06f5 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -26,9 +26,10 @@
 
 #include <stdarg.h>
 #include <ust/immediate.h>
-#include <ust/kernelcompat.h>
+#include <ust/core.h>
 #include <urcu/list.h>
 #include <ust/processor.h>
+#include <ust/kcompat/kcompat.h>
 
 #include <bits/wordsize.h>
 
@@ -128,8 +129,8 @@ struct marker {
 		     _ASM_PTR "0\n\t" /* tp_cb */						\
 		     _ASM_PTR "(1f)\n\t" /* location */						\
 		     ".previous\n\t"								\
-		     ARCH_COPY_ADDR("%[outptr]")						\
 		     "1:\n\t"									\
+		     ARCH_COPY_ADDR("%[outptr]")						\
 		: [outptr] "=r" (m) );								\
 												\
 		save_registers(&regs)
@@ -187,12 +188,12 @@ struct marker {
 
 #define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \
 	do {								\
-		struct marker m;					\
+		struct registers regs;								\
 		void __check_tp_type(void)				\
 		{							\
 			register_trace_##tp_name(tp_cb);		\
 		}							\
-		DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format, unique, m);\
+		DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\
 		__mark_check_format(format, ## args);			\
 		(*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \
 			call_private, &regs, ## args);				\