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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 7e935c17..bd1ef699 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>
@@ -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 *));