diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c
index 7bed25076fa9..1ae8dd614222 100644
--- a/sys/kern/subr_csan.c
+++ b/sys/kern/subr_csan.c
@@ -563,10 +563,8 @@ CSAN_ATOMIC_FUNC_SET(32, uint32_t)
 CSAN_ATOMIC_FUNC_SUBTRACT(32, uint32_t)
 CSAN_ATOMIC_FUNC_STORE(32, uint32_t)
 CSAN_ATOMIC_FUNC_SWAP(32, uint32_t)
-#if !defined(__aarch64__)
 CSAN_ATOMIC_FUNC_TESTANDCLEAR(32, uint32_t)
 CSAN_ATOMIC_FUNC_TESTANDSET(32, uint32_t)
-#endif
 
 CSAN_ATOMIC_FUNC_ADD(64, uint64_t)
 CSAN_ATOMIC_FUNC_CLEAR(64, uint64_t)
@@ -579,10 +577,8 @@ CSAN_ATOMIC_FUNC_SET(64, uint64_t)
 CSAN_ATOMIC_FUNC_SUBTRACT(64, uint64_t)
 CSAN_ATOMIC_FUNC_STORE(64, uint64_t)
 CSAN_ATOMIC_FUNC_SWAP(64, uint64_t)
-#if !defined(__aarch64__)
 CSAN_ATOMIC_FUNC_TESTANDCLEAR(64, uint64_t)
 CSAN_ATOMIC_FUNC_TESTANDSET(64, uint64_t)
-#endif
 
 CSAN_ATOMIC_FUNC_ADD(char, uint8_t)
 CSAN_ATOMIC_FUNC_CLEAR(char, uint8_t)
@@ -627,10 +623,8 @@ CSAN_ATOMIC_FUNC_SET(int, u_int)
 CSAN_ATOMIC_FUNC_SUBTRACT(int, u_int)
 CSAN_ATOMIC_FUNC_STORE(int, u_int)
 CSAN_ATOMIC_FUNC_SWAP(int, u_int)
-#if !defined(__aarch64__)
 CSAN_ATOMIC_FUNC_TESTANDCLEAR(int, u_int)
 CSAN_ATOMIC_FUNC_TESTANDSET(int, u_int)
-#endif
 
 CSAN_ATOMIC_FUNC_ADD(long, u_long)
 CSAN_ATOMIC_FUNC_CLEAR(long, u_long)
@@ -643,11 +637,9 @@ CSAN_ATOMIC_FUNC_SET(long, u_long)
 CSAN_ATOMIC_FUNC_SUBTRACT(long, u_long)
 CSAN_ATOMIC_FUNC_STORE(long, u_long)
 CSAN_ATOMIC_FUNC_SWAP(long, u_long)
-#if !defined(__aarch64__)
 CSAN_ATOMIC_FUNC_TESTANDCLEAR(long, u_long)
 CSAN_ATOMIC_FUNC_TESTANDSET(long, u_long)
 CSAN_ATOMIC_FUNC_TESTANDSET(acq_long, u_long)
-#endif
 
 CSAN_ATOMIC_FUNC_ADD(ptr, uintptr_t)
 CSAN_ATOMIC_FUNC_CLEAR(ptr, uintptr_t)