From 814f4c5896395c0b2145b5b747d201a2c76aea62 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Fri, 1 Aug 2014 23:45:50 +0000 Subject: [PATCH] Use the 64-bit atomics now provided by arm machine/atomic.h instead of (conflicting) local versions. --- sys/cddl/compat/opensolaris/sys/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cddl/compat/opensolaris/sys/atomic.h b/sys/cddl/compat/opensolaris/sys/atomic.h index f34d77e6f38c..813cda0d3802 100644 --- a/sys/cddl/compat/opensolaris/sys/atomic.h +++ b/sys/cddl/compat/opensolaris/sys/atomic.h @@ -36,7 +36,7 @@ atomic_cmpset_ptr((volatile uintptr_t *)(_a), (uintptr_t)(_b), (uintptr_t) (_c)) #define cas32 atomic_cmpset_32 -#if !defined(__LP64__) && !defined(__mips_n32) +#if !defined(__LP64__) && !defined(__mips_n32) && !defined(__arm__) extern void atomic_add_64(volatile uint64_t *target, int64_t delta); extern void atomic_dec_64(volatile uint64_t *target); #endif @@ -85,7 +85,7 @@ atomic_dec_32_nv(volatile uint32_t *target) return (atomic_fetchadd_32(target, -1) - 1); } -#if defined(__LP64__) || defined(__mips_n32) +#if defined(__LP64__) || defined(__mips_n32) || defined(__arm__) static __inline void atomic_dec_64(volatile uint64_t *target) {