X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=55900988028642192657dfc88948ce4f9355502c;hb=6fa0d97f663351869797d35ddb504489e223fa7c;hp=7e935c1720d5e7a101982a1041b9b05c2170b470;hpb=9692fa182535c55f0a03f79f26211aed9906da82;p=lttng-ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 7e935c17..55900988 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -29,7 +29,7 @@
 #include <ust/immediate.h>
 //ust// #include <linux/ltt-channels.h>
 #include <ust/kernelcompat.h>
-#include <kcompat/list.h>
+#include <urcu/list.h>
 #include <ust/processor.h>
 
 #include <bits/wordsize.h>
@@ -112,7 +112,7 @@ struct marker {
 		);										\
 		asm volatile (									\
 		     ".section __markers,\"aw\",@progbits\n\t"					\
-		     ".align 8\n\t"								\
+		     ".balign 8\n\t" 								\
 		     "2:\n\t" \
 		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ")\n\t" /* channel string */ \
 		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ")\n\t" /* name string */ \
@@ -121,7 +121,7 @@ struct marker {
 		     ".byte 0\n\t" /* ptype */							\
 		     ".word 0\n\t" /* channel_id */						\
 		     ".word 0\n\t" /* event_id */						\
-		     ".align " XSTR(__WORDSIZE) " / 8\n\t" /* alignment */			\
+		     ".balign " XSTR(__WORDSIZE) " / 8\n\t" /* alignment */			\
 		     _ASM_PTR "(marker_probe_cb)\n\t" /* call */				\
 		     _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
 		     _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */			\
@@ -130,8 +130,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("2b", "%[outptr]") "\n\t"					\
 		: [outptr] "=r" (m) );								\
 												\
 		save_registers(&regs)
@@ -347,6 +347,7 @@ struct lib {
 };
 
 extern int marker_register_lib(struct marker *markers_start, int markers_count);
+extern int marker_unregister_lib(struct marker *markers_start);
 
 #define MARKER_LIB							\
 	extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
@@ -355,6 +356,11 @@ extern int marker_register_lib(struct marker *markers_start, int markers_count);
 	static void __attribute__((constructor)) __markers__init(void)	\
 	{								\
 		marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
+	} \
+	\
+	static void __attribute__((destructor)) __markers__destroy(void)	\
+	{								\
+		marker_unregister_lib(__start___markers); \
 	}
 
 extern void marker_set_new_marker_cb(void (*cb)(struct marker *));