Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/arch/mips32/src/debugger.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -412,5 +412,5 @@
 		 *   so this is a good idea
 		 */
-		atomic_set(&haltstate, 1);
+		atomic_store(&haltstate, 1);
 		irq_spinlock_unlock(&bkpoint_lock, false);
 
@@ -418,5 +418,5 @@
 
 		irq_spinlock_lock(&bkpoint_lock, false);
-		atomic_set(&haltstate, 0);
+		atomic_store(&haltstate, 0);
 #endif
 	}
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -230,5 +230,5 @@
 				exec_units[i].exec_unit_id = exec_unit_id;
 				exec_units[i].strand_count = 0;
-				atomic_set(&(exec_units[i].nrdy), 0);
+				atomic_store(&(exec_units[i].nrdy), 0);
 				spinlock_initialize(&(exec_units[i].proposed_nrdy_lock), "exec_units[].proposed_nrdy_lock");
 				exec_unit_count++;
@@ -270,5 +270,5 @@
 		exec_units[0].exec_unit_id = 1;
 		spinlock_initialize(&(exec_units[0].proposed_nrdy_lock), "exec_units[0].proposed_nrdy_lock");
-		atomic_set(&(exec_units[0].nrdy), 0);
+		atomic_store(&(exec_units[0].nrdy), 0);
 		max_core_strands = cpu_count;