X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=81dfbc9a16d1258148c14e6d736d8204ab081ad4;hb=ae14f8220190e23cc9d9ec6023c1813a8fb2ad32;hp=8d90e2c367dafae1a88b8f077208a8fb0596e82d;hpb=b246453617a1665c64289c33a10dc3f31b1a1158;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 8d90e2c3..81dfbc9a 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -430,17 +430,17 @@ void lttng_fixup_ust_mutex_nest_tls(void)
 }
 
 /*
- * Fixup urcu bp TLS.
+ * Fixup lttng-ust urcu TLS.
  */
 static
-void lttng_fixup_urcu_bp_tls(void)
+void lttng_fixup_lttng_ust_urcu_tls(void)
 {
 	(void) lttng_ust_urcu_read_ongoing();
 }
 
 void lttng_ust_fixup_tls(void)
 {
-	lttng_fixup_urcu_bp_tls();
+	lttng_fixup_lttng_ust_urcu_tls();
 	lttng_fixup_ringbuffer_tls();
 	lttng_fixup_vtid_tls();
 	lttng_fixup_nest_count_tls();
@@ -2402,8 +2402,6 @@ void ust_before_fork(sigset_t *save_sigset)
 
 	ust_lock_nocheck();
 	lttng_ust_urcu_before_fork();
-	if (lttng_ust_liburcu_bp_before_fork)
-		lttng_ust_liburcu_bp_before_fork();
 	lttng_ust_lock_fd_tracker();
 	lttng_perf_lock();
 }
@@ -2432,8 +2430,6 @@ void ust_after_fork_parent(sigset_t *restore_sigset)
 		return;
 	DBG("process %d", getpid());
 	lttng_ust_urcu_after_fork_parent();
-	if (lttng_ust_liburcu_bp_after_fork_parent)
-		lttng_ust_liburcu_bp_after_fork_parent();
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(restore_sigset);
 }
@@ -2460,8 +2456,6 @@ void ust_after_fork_child(sigset_t *restore_sigset)
 	DBG("process %d", getpid());
 	/* Release urcu mutexes */
 	lttng_ust_urcu_after_fork_child();
-	if (lttng_ust_liburcu_bp_after_fork_child)
-		lttng_ust_liburcu_bp_after_fork_child();
 	lttng_ust_cleanup(0);
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(restore_sigset);