X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu-call-rcu-impl.h;h=5cc02d97704514df5e45a7dd459744d7f79eb597;hp=a55ac085d3a86fe5b4a020a82dc85b09a3bfc9b2;hb=109105b7f91d58e29a2b0cfb18c325d57cf80199;hpb=81dd9134333f1c00117cf5addd2f193b89998201

diff --git a/urcu-call-rcu-impl.h b/urcu-call-rcu-impl.h
index a55ac08..5cc02d9 100644
--- a/urcu-call-rcu-impl.h
+++ b/urcu-call-rcu-impl.h
@@ -309,7 +309,7 @@ static void *call_rcu_thread(void *arg)
 			cmm_smp_mb__before_uatomic_or();
 			uatomic_or(&crdp->flags, URCU_CALL_RCU_PAUSED);
 			while ((uatomic_read(&crdp->flags) & URCU_CALL_RCU_PAUSE) != 0)
-				poll(NULL, 0, 1);
+				(void) poll(NULL, 0, 1);
 			uatomic_and(&crdp->flags, ~URCU_CALL_RCU_PAUSED);
 			cmm_smp_mb__after_uatomic_and();
 			rcu_register_thread();
@@ -341,7 +341,7 @@ static void *call_rcu_thread(void *arg)
 			if (cds_wfcq_empty(&crdp->cbs_head,
 					&crdp->cbs_tail)) {
 				call_rcu_wait(crdp);
-				poll(NULL, 0, 10);
+				(void) poll(NULL, 0, 10);
 				uatomic_dec(&crdp->futex);
 				/*
 				 * Decrement futex before reading
@@ -349,10 +349,10 @@ static void *call_rcu_thread(void *arg)
 				 */
 				cmm_smp_mb();
 			} else {
-				poll(NULL, 0, 10);
+				(void) poll(NULL, 0, 10);
 			}
 		} else {
-			poll(NULL, 0, 10);
+			(void) poll(NULL, 0, 10);
 		}
 		rcu_thread_online();
 	}
@@ -669,10 +669,10 @@ void call_rcu(struct rcu_head *head,
 	struct call_rcu_data *crdp;
 
 	/* Holding rcu read-side lock across use of per-cpu crdp */
-	rcu_read_lock();
+	_rcu_read_lock();
 	crdp = get_call_rcu_data();
 	_call_rcu(head, func, crdp);
-	rcu_read_unlock();
+	_rcu_read_unlock();
 }
 
 /*
@@ -710,7 +710,7 @@ void call_rcu_data_free(struct call_rcu_data *crdp)
 		uatomic_or(&crdp->flags, URCU_CALL_RCU_STOP);
 		wake_call_rcu_thread(crdp);
 		while ((uatomic_read(&crdp->flags) & URCU_CALL_RCU_STOPPED) == 0)
-			poll(NULL, 0, 1);
+			(void) poll(NULL, 0, 1);
 	}
 	if (!cds_wfcq_empty(&crdp->cbs_head, &crdp->cbs_tail)) {
 		/* Create default call rcu data if need be */
@@ -804,14 +804,14 @@ void rcu_barrier(void)
 	int was_online;
 
 	/* Put in offline state in QSBR. */
-	was_online = rcu_read_ongoing();
+	was_online = _rcu_read_ongoing();
 	if (was_online)
 		rcu_thread_offline();
 	/*
 	 * Calling a rcu_barrier() within a RCU read-side critical
 	 * section is an error.
 	 */
-	if (rcu_read_ongoing()) {
+	if (_rcu_read_ongoing()) {
 		static int warned = 0;
 
 		if (!warned) {
@@ -880,7 +880,7 @@ void call_rcu_before_fork(void)
 	}
 	cds_list_for_each_entry(crdp, &call_rcu_data_list, list) {
 		while ((uatomic_read(&crdp->flags) & URCU_CALL_RCU_PAUSED) == 0)
-			poll(NULL, 0, 1);
+			(void) poll(NULL, 0, 1);
 	}
 }
 
@@ -897,7 +897,7 @@ void call_rcu_after_fork_parent(void)
 		uatomic_and(&crdp->flags, ~URCU_CALL_RCU_PAUSE);
 	cds_list_for_each_entry(crdp, &call_rcu_data_list, list) {
 		while ((uatomic_read(&crdp->flags) & URCU_CALL_RCU_PAUSED) != 0)
-			poll(NULL, 0, 1);
+			(void) poll(NULL, 0, 1);
 	}
 	call_rcu_unlock(&call_rcu_mutex);
 }