Date: Fri, 11 Feb 2022 11:13:52 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 725225a72a2a - stable/13 - x86 atomic.h: cleanup comments for preprocessor directives Message-ID: <202202111113.21BBDqG0078467@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=725225a72a2a859762e8237b8202cc605a1dcac7 commit 725225a72a2a859762e8237b8202cc605a1dcac7 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2022-02-03 09:25:03 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2022-02-11 10:52:55 +0000 x86 atomic.h: cleanup comments for preprocessor directives (cherry picked from commit cbf999e75d61c6efadeed8d32212eefa4dfb3dcb) --- 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 c821e77e5b8b..1436c36daf2a 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -148,7 +148,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 @@ -436,7 +436,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202111113.21BBDqG0078467>