Skip to content

Commit fa368cc

Browse files
committed
x86 atomics: Remove unused WANT_FUNCTIONS
This macro has not been in use since commit "inline atomics and allow tied modules to inline locks" (r335873, f4b3640). Reviewed by: markj, kib, emaste, imp MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48061
1 parent f1ddb6f commit fa368cc

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

sys/amd64/include/atomic.h

-3
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@ ATOMIC_LOADSTORE(long);
385385
#undef ATOMIC_LOAD
386386
#undef ATOMIC_STORE
387387
#undef ATOMIC_LOADSTORE
388-
#ifndef WANT_FUNCTIONS
389388

390389
/* Read the current value and store a new value in the destination. */
391390
static __inline u_int
@@ -592,8 +591,6 @@ atomic_swap_long(volatile u_long *p, u_long v)
592591
#define atomic_testandset_ptr atomic_testandset_long
593592
#define atomic_testandclear_ptr atomic_testandclear_long
594593

595-
#endif /* !WANT_FUNCTIONS */
596-
597594
#endif /* !SAN_NEEDS_INTERCEPTORS || SAN_RUNTIME */
598595

599596
#endif /* !_MACHINE_ATOMIC_H_ */

sys/i386/include/atomic.h

-15
Original file line numberDiff line numberDiff line change
@@ -299,17 +299,6 @@ atomic_thread_fence_seq_cst(void)
299299

300300
#ifdef _KERNEL
301301

302-
#ifdef WANT_FUNCTIONS
303-
int atomic_cmpset_64_i386(volatile uint64_t *, uint64_t, uint64_t);
304-
int atomic_cmpset_64_i586(volatile uint64_t *, uint64_t, uint64_t);
305-
uint64_t atomic_load_acq_64_i386(const volatile uint64_t *);
306-
uint64_t atomic_load_acq_64_i586(const volatile uint64_t *);
307-
void atomic_store_rel_64_i386(volatile uint64_t *, uint64_t);
308-
void atomic_store_rel_64_i586(volatile uint64_t *, uint64_t);
309-
uint64_t atomic_swap_64_i386(volatile uint64_t *, uint64_t);
310-
uint64_t atomic_swap_64_i586(volatile uint64_t *, uint64_t);
311-
#endif
312-
313302
/* I486 does not support SMP or CMPXCHG8B. */
314303
static __inline int
315304
atomic_cmpset_64_i386(volatile uint64_t *dst, uint64_t expect, uint64_t src)
@@ -618,8 +607,6 @@ ATOMIC_LOADSTORE(long);
618607
#undef ATOMIC_STORE
619608
#undef ATOMIC_LOADSTORE
620609

621-
#ifndef WANT_FUNCTIONS
622-
623610
static __inline int
624611
atomic_cmpset_long(volatile u_long *dst, u_long expect, u_long src)
625612
{
@@ -874,8 +861,6 @@ atomic_swap_long(volatile u_long *p, u_long v)
874861
#define atomic_testandset_ptr(p, val) \
875862
atomic_testandset_int((volatile u_int *)(p), (val))
876863

877-
#endif /* !WANT_FUNCTIONS */
878-
879864
#if defined(_KERNEL)
880865
#define mb() __mbk()
881866
#define wmb() __mbk()

0 commit comments

Comments
 (0)