Index: kernel/generic/src/synch/rcu.c
===================================================================
--- kernel/generic/src/synch/rcu.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/synch/rcu.c	(revision 4b54bd956b3a55ffeefc87990668ef0a39c2c4a2)
@@ -312,5 +312,5 @@
 
 	mutex_initialize(&rcu.barrier_mtx, MUTEX_PASSIVE);
-	atomic_set(&rcu.barrier_wait_cnt, 0);
+	atomic_store(&rcu.barrier_wait_cnt, 0);
 	waitq_initialize(&rcu.barrier_wq);
 
@@ -322,5 +322,5 @@
 	rcu.req_gp_end_cnt = 0;
 	rcu.req_expedited_cnt = 0;
-	atomic_set(&rcu.delaying_cpu_cnt, 0);
+	atomic_store(&rcu.delaying_cpu_cnt, 0);
 #endif
 
@@ -594,5 +594,5 @@
 	 * enqueued barrier callbacks start signaling completion.
 	 */
-	atomic_set(&rcu.barrier_wait_cnt, 1);
+	atomic_store(&rcu.barrier_wait_cnt, 1);
 
 	DEFINE_CPU_MASK(cpu_mask);
@@ -1412,5 +1412,5 @@
 static void interrupt_delaying_cpus(cpu_mask_t *cpu_mask)
 {
-	atomic_set(&rcu.delaying_cpu_cnt, 0);
+	atomic_store(&rcu.delaying_cpu_cnt, 0);
 
 	sample_cpus(cpu_mask, NULL);