The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf999e75d61c6efadeed8d32212eefa4dfb3dcb
commit cbf999e75d61c6efadeed8d32212eefa4dfb3dcb Author: Konstantin Belousov <[email protected]> AuthorDate: 2022-02-03 09:25:03 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2022-02-04 12:01:39 +0000 x86 atomic.h: cleanup comments for preprocessor directives Reviewed by: Elliott Mitchell, imp, jhb, markj, royger Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34153 --- sys/amd64/include/atomic.h | 4 ++-- sys/i386/include/atomic.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index 4a9095ca831b..ed80c426add2 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -140,7 +140,7 @@ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p) #define ATOMIC_STORE(TYPE) \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#else /* !KLD_MODULE && __GNUCLIKE_ASM */ +#else /* !__GNUCLIKE_ASM */ /* * For userland, always use lock prefixes so that the binaries will run @@ -428,7 +428,7 @@ atomic_thread_fence_seq_cst(void) __storeload_barrier(); } -#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ +#endif /* !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v); diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index 14fa3040341c..c65a7ac83a93 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -138,7 +138,7 @@ uint64_t atomic_fetchadd_64(volatile uint64_t *, uint64_t); void atomic_add_64(volatile uint64_t *, uint64_t); void atomic_subtract_64(volatile uint64_t *, uint64_t); -#else /* !KLD_MODULE && __GNUCLIKE_ASM */ +#else /* !__GNUCLIKE_ASM */ /* * For userland, always use lock prefixes so that the binaries will run @@ -650,7 +650,7 @@ atomic_subtract_64(volatile uint64_t *p, uint64_t v) #endif /* _KERNEL */ -#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ +#endif /* !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v);
