git: b6a3bda9bc2e - stable/13 - x86 atomics: Remove unused WANT_FUNCTIONS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jan 2025 12:27:22 UTC
The branch stable/13 has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596
commit b6a3bda9bc2eebbc7630ec7a9ccb27ca923ef596
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-12-09 16:13:09 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-01-17 12:24:53 +0000
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, f4b3640475cec929).
Reviewed by: markj, kib, emaste, imp
MFC after: 5 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48061
(cherry picked from commit fa368cc86cebe7185b3a99d4f6083033da377eee)
---
sys/amd64/include/atomic.h | 3 ---
sys/i386/include/atomic.h | 15 ---------------
2 files changed, 18 deletions(-)
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index c1816ac4fb8b..da4e42cd0763 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -418,7 +418,6 @@ ATOMIC_LOADSTORE(long);
#undef ATOMIC_LOAD
#undef ATOMIC_STORE
#undef ATOMIC_LOADSTORE
-#ifndef WANT_FUNCTIONS
/* Read the current value and store a new value in the destination. */
#ifdef __GNUCLIKE_ASM
@@ -632,8 +631,6 @@ u_long atomic_swap_long(volatile u_long *p, u_long v);
#define atomic_swap_ptr atomic_swap_long
#define atomic_readandclear_ptr atomic_readandclear_long
-#endif /* !WANT_FUNCTIONS */
-
#endif /* !SAN_NEEDS_INTERCEPTORS || SAN_RUNTIME */
#endif /* !_MACHINE_ATOMIC_H_ */
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index 2ccd206a35ec..d8c7d231cc73 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -339,17 +339,6 @@ atomic_thread_fence_seq_cst(void)
#ifdef _KERNEL
-#ifdef WANT_FUNCTIONS
-int atomic_cmpset_64_i386(volatile uint64_t *, uint64_t, uint64_t);
-int atomic_cmpset_64_i586(volatile uint64_t *, uint64_t, uint64_t);
-uint64_t atomic_load_acq_64_i386(const volatile uint64_t *);
-uint64_t atomic_load_acq_64_i586(const volatile uint64_t *);
-void atomic_store_rel_64_i386(volatile uint64_t *, uint64_t);
-void atomic_store_rel_64_i586(volatile uint64_t *, uint64_t);
-uint64_t atomic_swap_64_i386(volatile uint64_t *, uint64_t);
-uint64_t atomic_swap_64_i586(volatile uint64_t *, uint64_t);
-#endif
-
/* I486 does not support SMP or CMPXCHG8B. */
static __inline int
atomic_cmpset_64_i386(volatile uint64_t *dst, uint64_t expect, uint64_t src)
@@ -660,8 +649,6 @@ ATOMIC_LOADSTORE(long);
#undef ATOMIC_STORE
#undef ATOMIC_LOADSTORE
-#ifndef WANT_FUNCTIONS
-
static __inline int
atomic_cmpset_long(volatile u_long *dst, u_long expect, u_long src)
{
@@ -921,8 +908,6 @@ u_long atomic_swap_long(volatile u_long *p, u_long v);
#define atomic_readandclear_ptr(p) \
atomic_readandclear_int((volatile u_int *)(p))
-#endif /* !WANT_FUNCTIONS */
-
#if defined(_KERNEL)
#define mb() __mbk()
#define wmb() __mbk()