Date: Fri, 1 Aug 2014 23:45:50 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269410 - head/sys/cddl/compat/opensolaris/sys Message-ID: <201408012345.s71Njo36085515@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri Aug 1 23:45:50 2014 New Revision: 269410 URL: http://svnweb.freebsd.org/changeset/base/269410 Log: Use the 64-bit atomics now provided by arm machine/atomic.h instead of (conflicting) local versions. Modified: head/sys/cddl/compat/opensolaris/sys/atomic.h Modified: head/sys/cddl/compat/opensolaris/sys/atomic.h ============================================================================== --- head/sys/cddl/compat/opensolaris/sys/atomic.h Fri Aug 1 23:29:04 2014 (r269409) +++ head/sys/cddl/compat/opensolaris/sys/atomic.h Fri Aug 1 23:45:50 2014 (r269410) @@ -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 *targ 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408012345.s71Njo36085515>