3 files changed, 12 insertions, 0 deletions

diff --git a/sys/arm/include/atomic-v4.h b/sys/arm/include/atomic-v4.h
index f30abca99b023..7743225e790be 100644
--- a/sys/arm/include/atomic-v4.h
+++ b/sys/arm/include/atomic-v4.h
@@ -521,8 +521,10 @@ atomic_swap_32(volatile u_int32_t *p, u_int32_t v)
 #define atomic_fcmpset_rel_32	atomic_fcmpset_32
 #define atomic_fcmpset_acq_32	atomic_fcmpset_32
 #ifdef _KERNEL
+#define atomic_fcmpset_8	atomic_fcmpset_8
 #define atomic_fcmpset_rel_8	atomic_fcmpset_8
 #define atomic_fcmpset_acq_8	atomic_fcmpset_8
+#define atomic_fcmpset_16	atomic_fcmpset_16
 #define atomic_fcmpset_rel_16	atomic_fcmpset_16
 #define atomic_fcmpset_acq_16	atomic_fcmpset_16
 #define atomic_fcmpset_rel_64	atomic_fcmpset_64
@@ -533,8 +535,10 @@ atomic_swap_32(volatile u_int32_t *p, u_int32_t v)
 #define atomic_cmpset_rel_32	atomic_cmpset_32
 #define atomic_cmpset_acq_32	atomic_cmpset_32
 #ifdef _KERNEL
+#define atomic_cmpset_8		atomic_cmpset_8
 #define atomic_cmpset_rel_8	atomic_cmpset_8
 #define atomic_cmpset_acq_8	atomic_cmpset_8
+#define atomic_cmpset_16	atomic_cmpset_16
 #define atomic_cmpset_rel_16	atomic_cmpset_16
 #define atomic_cmpset_acq_16	atomic_cmpset_16
 #define atomic_cmpset_rel_64	atomic_cmpset_64
diff --git a/sys/arm/include/atomic-v6.h b/sys/arm/include/atomic-v6.h
index d8a52e17dac37..8ca588261f71d 100644
--- a/sys/arm/include/atomic-v6.h
+++ b/sys/arm/include/atomic-v6.h
@@ -245,6 +245,7 @@ atomic_fcmpset_8(volatile uint8_t *_ptr, uint8_t *_old, uint8_t _new)
 	ATOMIC_FCMPSET_CODE(ret, uint8_t, "b");
 	return (ret);
 }
+#define	atomic_fcmpset_8	atomic_fcmpset_8
 
 static __inline int
 atomic_fcmpset_acq_8(volatile uint8_t *_ptr, uint8_t *_old, uint8_t _new)
@@ -274,6 +275,7 @@ atomic_fcmpset_16(volatile uint16_t *_ptr, uint16_t *_old, uint16_t _new)
 	ATOMIC_FCMPSET_CODE(ret, uint16_t, "h");
 	return (ret);
 }
+#define	atomic_fcmpset_16	atomic_fcmpset_16
 
 static __inline int
 atomic_fcmpset_acq_16(volatile uint16_t *_ptr, uint16_t *_old, uint16_t _new)
@@ -429,6 +431,7 @@ atomic_cmpset_8(volatile uint8_t *_ptr, uint8_t _old, uint8_t _new)
 	ATOMIC_CMPSET_CODE(ret, "b");
 	return (ret);
 }
+#define	atomic_cmpset_8		atomic_cmpset_8
 
 static __inline int
 atomic_cmpset_acq_8(volatile uint8_t *_ptr, uint8_t _old, uint8_t _new)
@@ -458,6 +461,7 @@ atomic_cmpset_16(volatile uint16_t *_ptr, uint16_t _old, uint16_t _new)
 	ATOMIC_CMPSET_CODE(ret, "h");
 	return (ret);
 }
+#define	atomic_cmpset_16	atomic_cmpset_16
 
 static __inline int
 atomic_cmpset_acq_16(volatile uint16_t *_ptr, uint16_t _old, uint16_t _new)
@@ -899,6 +903,7 @@ atomic_testandclear_long(volatile u_long *p, u_int v)
 
 	return (atomic_testandclear_32((volatile uint32_t *)p, v));
 }
+#define	atomic_testandclear_long	atomic_testandclear_long
 
 static __inline int
 atomic_testandset_32(volatile uint32_t *ptr, u_int bit)
@@ -942,6 +947,7 @@ atomic_testandset_long(volatile u_long *p, u_int v)
 
 	return (atomic_testandset_32((volatile uint32_t *)p, v));
 }
+#define	atomic_testandset_long	atomic_testandset_long
 
 static __inline int
 atomic_testandset_64(volatile uint64_t *p, u_int v)
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 25a764dee736f..9281096782ef4 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -103,4 +103,6 @@ atomic_swap_long(volatile u_long *p, u_long v)
 #define atomic_store_rel_int		atomic_store_rel_32
 #define atomic_swap_int			atomic_swap_32
 
+#include <sys/_atomic_subword.h>
+
 #endif /* _MACHINE_ATOMIC_H_ */