X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0a7de7458d150b5d4dffc935ba399be265ef0a1a..bca245acd4c03fd752d1a45f011ad495e60fe53d:/osfmk/arm64/dbgwrap.c

diff --git a/osfmk/arm64/dbgwrap.c b/osfmk/arm64/dbgwrap.c
index 666efc2d3..7aa70d824 100644
--- a/osfmk/arm64/dbgwrap.c
+++ b/osfmk/arm64/dbgwrap.c
@@ -115,7 +115,7 @@ ml_dbgwrap_halt_cpu(int cpu_index, uint64_t timeout_ns)
 		return DBGWRAP_ERR_SELF_HALT;
 	}
 
-	if (!hw_compare_and_store((uint32_t)-1, (unsigned int)curcpu, &halt_from_cpu) &&
+	if (!os_atomic_cmpxchg(&halt_from_cpu, (uint32_t)-1, (unsigned int)curcpu, acq_rel) &&
 	    (halt_from_cpu != (uint32_t)curcpu)) {
 		return DBGWRAP_ERR_INPROGRESS;
 	}
@@ -155,7 +155,7 @@ ml_dbgwrap_stuff_instr(cpu_data_t *cdp, uint32_t instr, uint64_t timeout_ns, dbg
 	uint64_t deadline = mach_absolute_time() + interval;
 
 #if DEVELOPMENT || DEBUG
-	uint32_t stuffed_instr_index = hw_atomic_add(&stuffed_instr_count, 1);
+	uint32_t stuffed_instr_index = os_atomic_inc(&stuffed_instr_count, relaxed);
 	stuffed_instrs[(stuffed_instr_index - 1) % MAX_STUFFED_INSTRS] = instr;
 #endif