Use C11 <stdatomic.h> instead of our non-standard <machine/atomic.h>.

Reviewed by:	pjd

1 files changed, 14 insertions, 5 deletions

diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h
index a989df0..5e3fb34 100644
--- a/sbin/hastd/refcnt.h
+++ b/sbin/hastd/refcnt.h
@@ -32,24 +32,33 @@
 #ifndef __REFCNT_H__
 #define __REFCNT_H__
 
-#include <machine/atomic.h>
+#include <stdatomic.h>
 
 #include "pjdlog.h"
 
+typedef atomic_uint refcnt_t;
+
+static __inline void
+refcnt_init(refcnt_t *count, unsigned int v)
+{
+
+	atomic_init(count, v);
+}
+
 static __inline void
-refcnt_acquire(volatile unsigned int *count)
+refcnt_acquire(refcnt_t *count)
 {
 
-	atomic_add_acq_int(count, 1);
+	atomic_fetch_add_explicit(count, 1, memory_order_acquire);
 }
 
 static __inline unsigned int
-refcnt_release(volatile unsigned int *count)
+refcnt_release(refcnt_t *count)
 {
 	unsigned int old;
 
 	/* XXX: Should this have a rel membar? */
-	old = atomic_fetchadd_int(count, -1);
+	old = atomic_fetch_sub(count, 1);
 	PJDLOG_ASSERT(old > 0);
 	return (old - 1);
 }