diff options
| author | Ryan Stone <rstone@FreeBSD.org> | 2013-03-08 21:04:16 +0000 |
|---|---|---|
| committer | Ryan Stone <rstone@FreeBSD.org> | 2013-03-08 21:04:16 +0000 |
| commit | ec6217bef04ccd1bf26db7c3810751dd680ca836 (patch) | |
| tree | 070b8466e4b5587fbbecc9a807e4711b684310c6 /sys | |
| parent | 7a217ec3d4488f27ded6c1c17ed5321593a79d28 (diff) | |
MFC r226452 (by marcel@)
Define dtrace_cmpset_long in terms of atomic_cmpset_long
and not by virtue of inline assembly. Now this file
compiles on all supported architectures.
Notes
svn path=/stable/8/; revision=248072
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cddl/dev/dtrace/dtrace_debug.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/sys/cddl/dev/dtrace/dtrace_debug.c b/sys/cddl/dev/dtrace/dtrace_debug.c index 03af9aa0efd9..7202fe23e75f 100644 --- a/sys/cddl/dev/dtrace/dtrace_debug.c +++ b/sys/cddl/dev/dtrace/dtrace_debug.c @@ -31,49 +31,9 @@ #ifdef DEBUG -#if defined(__amd64__) -static __inline int -dtrace_cmpset_long(volatile u_long *dst, u_long exp, u_long src) -{ - u_char res; - - __asm __volatile( - " lock ; " - " cmpxchgq %2,%1 ; " - " sete %0 ; " - "1: " - "# dtrace_cmpset_long" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); - - return (res); -} -#elif defined(__i386__) -static __inline int -dtrace_cmpset_long(volatile u_long *dst, u_long exp, u_long src) -{ - u_char res; - - __asm __volatile( - " lock ; " - " cmpxchgl %2,%1 ; " - " sete %0 ; " - "1: " - "# dtrace_cmpset_long" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); +#include <machine/atomic.h> - return (res); -} -#endif +#define dtrace_cmpset_long atomic_cmpset_long #define DTRACE_DEBUG_BUFR_SIZE (32 * 1024) |