X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Fchannels.c;h=85e5944e325db8010e556b5b94f3fa5cdfc32a52;hb=535b0d0af1b6421ceb83e22821e85bc6919d16d9;hp=893070570f715196000ba6fbcec35a7f20a0eac6;hpb=205f7ca77a36f7942a3348e7b8ea3c1f86f1c7ee;p=ust.git diff --git a/libust/channels.c b/libust/channels.c index 8930705..85e5944 100644 --- a/libust/channels.c +++ b/libust/channels.c @@ -25,8 +25,9 @@ #include #include +#include #include "channels.h" -#include "usterr.h" +#include "usterr_signal_safe.h" /* * ltt_channel_mutex may be nested inside the LTT trace mutex. @@ -294,12 +295,12 @@ end: */ void ltt_channels_trace_free(struct ust_channel *channels) { - lock_markers(); + lock_ust_marker(); pthread_mutex_lock(<t_channel_mutex); free(channels); urcu_ref_put(&index_urcu_ref, release_trace_channel); pthread_mutex_unlock(<t_channel_mutex); - unlock_markers(); + unlock_ust_marker(); } //ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_free);