The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e08776813087f7926d6ec0a84dcfaba80c729c8b
commit e08776813087f7926d6ec0a84dcfaba80c729c8b Author: Doug Moore <[email protected]> AuthorDate: 2023-07-06 18:29:13 +0000 Commit: Doug Moore <[email protected]> CommitDate: 2023-07-06 18:29:13 +0000 inline_fls: remove redundant INLINE_FLS test HAS_INLINE_FLS and similar macros are defined always. Removes the redundant tests for these always-true conditions. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D40707 --- sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h index 7b738c8b0d13..31e1657105cd 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h @@ -392,7 +392,7 @@ extern unsigned char bcd_to_byte[256]; static __inline int highbit(unsigned long i) { -#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL) +#if defined(__FreeBSD__) && defined(_KERNEL) return (flsl(i)); #else int h = 1; @@ -430,7 +430,7 @@ highbit(unsigned long i) static __inline int highbit64(uint64_t i) { -#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSLL) +#if defined(__FreeBSD__) && defined(_KERNEL) return (flsll(i)); #else int h = 1;
