5042 stop using deprecated atomic functions

Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Robert Mustacchi <rm@joyent.com>

5 files changed, 8 insertions, 12 deletions

diff --git a/usr/src/uts/sun4u/cpu/spitfire.c b/usr/src/uts/sun4u/cpu/spitfire.c
index 9784a2338a..bf6bc3dcd0 100644
--- a/usr/src/uts/sun4u/cpu/spitfire.c
+++ b/usr/src/uts/sun4u/cpu/spitfire.c
@@ -4324,7 +4324,7 @@ ce_count_unum(int status, int len, char *unum)
 	/*
 	 * Initialize the leaky_bucket timeout
 	 */
-	if (casptr(&leaky_bucket_timeout_id,
+	if (atomic_cas_ptr(&leaky_bucket_timeout_id,
 	    TIMEOUT_NONE, TIMEOUT_SET) == TIMEOUT_NONE)
 		add_leaky_bucket_timeout();
 
diff --git a/usr/src/uts/sun4u/cpu/us3_common.c b/usr/src/uts/sun4u/cpu/us3_common.c
index 7fc8fcc986..301d7874df 100644
--- a/usr/src/uts/sun4u/cpu/us3_common.c
+++ b/usr/src/uts/sun4u/cpu/us3_common.c
@@ -898,7 +898,7 @@ mondo_recover(uint16_t cpuid, int bn)
 	cheetah_livelock_entry_t *histp;
 	uint64_t idsr;
 
-	if (cas32(&sendmondo_in_recover, 0, 1) != 0) {
+	if (atomic_cas_32(&sendmondo_in_recover, 0, 1) != 0) {
 		/*
 		 * Wait while recovery takes place
 		 */
@@ -984,7 +984,7 @@ done:
 	CHEETAH_LIVELOCK_ENTRY_SET(histp, recovery_time, \
 	    (end_hrt -  begin_hrt));
 
-	while (cas32(&sendmondo_in_recover, 1, 0) != 1)
+	while (atomic_cas_32(&sendmondo_in_recover, 1, 0) != 1)
 		;
 
 	return (retval);
@@ -6300,7 +6300,7 @@ cpu_ce_delayed_ec_logout(uint64_t afar)
 		return (0);
 
 	clop = CPU_PRIVATE_PTR(CPU, chpr_cecc_logout);
-	if (cas64(&clop->clo_data.chd_afar, LOGOUT_INVALID, afar) !=
+	if (atomic_cas_64(&clop->clo_data.chd_afar, LOGOUT_INVALID, afar) !=
 	    LOGOUT_INVALID)
 		return (0);
 
diff --git a/usr/src/uts/sun4u/io/zuluvm.c b/usr/src/uts/sun4u/io/zuluvm.c
index 46c68181ec..f1184f4580 100644
--- a/usr/src/uts/sun4u/io/zuluvm.c
+++ b/usr/src/uts/sun4u/io/zuluvm.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * zuluvm module
  *
@@ -78,7 +76,7 @@
 #define	ZULUVM_UNLOCK mutex_exit(&(zdev->dev_lck))
 
 #define	ZULUVM_SET_STATE(_z, b, c) \
-	cas32((uint32_t *)&((_z)->zvm.state), c, b)
+	atomic_cas_32((uint32_t *)&((_z)->zvm.state), c, b)
 #define	ZULUVM_GET_STATE(_z) \
 	(_z)->zvm.state
 #define	ZULUVM_SET_IDLE(_z) \
diff --git a/usr/src/uts/sun4u/os/ppage.c b/usr/src/uts/sun4u/os/ppage.c
index 17058e5029..87986771f1 100644
--- a/usr/src/uts/sun4u/os/ppage.c
+++ b/usr/src/uts/sun4u/os/ppage.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/archsystm.h>
@@ -189,7 +187,7 @@ ppmapin(page_t *pp, uint_t vprot, caddr_t hint)
 #ifdef PPDEBUG
 				align_hits[color]++;
 #endif /* PPDEBUG */
-				if (casptr(&ppmap_vaddrs[index],
+				if (atomic_cas_ptr(&ppmap_vaddrs[index],
 				    va, NULL) == va) {
 					hat_memload(kas.a_hat, va, pp,
 					    vprot | HAT_NOSYNC,
@@ -319,7 +317,7 @@ pp_load_tlb(processorid_t cpu, caddr_t **pslot, page_t *pp, uint_t prot)
 
 	for (i = start; i < pp_slots; i += stride) {
 		if (*myslot == NULL) {
-			if (casptr(myslot, NULL, va) == NULL)
+			if (atomic_cas_ptr(myslot, NULL, va) == NULL)
 				break;
 		}
 		myslot += stride;
diff --git a/usr/src/uts/sun4u/vm/zulu_hat.c b/usr/src/uts/sun4u/vm/zulu_hat.c
index e50e38d7b9..5ecadc028f 100644
--- a/usr/src/uts/sun4u/vm/zulu_hat.c
+++ b/usr/src/uts/sun4u/vm/zulu_hat.c
@@ -278,7 +278,7 @@ zulu_ctx_tsb_lock_enter(struct zulu_hat *zhat)
 
 			new_lck = lck | ZULU_CTX_LOCK;
 
-			old_lck = cas64(plck, lck, new_lck);
+			old_lck = atomic_cas_64(plck, lck, new_lck);
 
 			if (old_lck == lck) {
 				/*