X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fchannels.c;h=402b91581c370e7560224dc85240e4277514a2fe;hb=b979b3468dc6a9329288f53ce568815617780d9c;hp=893070570f715196000ba6fbcec35a7f20a0eac6;hpb=205f7ca77a36f7942a3348e7b8ea3c1f86f1c7ee;p=ust.git

diff --git a/libust/channels.c b/libust/channels.c
index 8930705..402b915 100644
--- a/libust/channels.c
+++ b/libust/channels.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <ust/marker.h>
 #include "channels.h"
-#include "usterr.h"
+#include "usterr_signal_safe.h"
 
 /*
  * ltt_channel_mutex may be nested inside the LTT trace mutex.
@@ -294,12 +294,12 @@ end:
  */
 void ltt_channels_trace_free(struct ust_channel *channels)
 {
-	lock_markers();
+	lock_ust_marker();
 	pthread_mutex_lock(&ltt_channel_mutex);
 	free(channels);
 	urcu_ref_put(&index_urcu_ref, release_trace_channel);
 	pthread_mutex_unlock(&ltt_channel_mutex);
-	unlock_markers();
+	unlock_ust_marker();
 }
 //ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_free);