LinuxKPI: improve hweight<n> if complie time constant

rtw89(4) uses a static_assert() with hweight<n> calls.  In order to
avoid compile time errors, deal with the case when the arguments to
hweight<n> are complie time constant.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Reviewed by:	emaste
Differential Revision: https://reviews.freebsd.org/D54806

This commit is contained in:

Bjoern A. Zeeb

2026-01-20 22:41:12 +00:00

parent 44d1153dda

commit 7e4a2b381d

1 changed files with 6 additions and 6 deletions

									
										sys/compat/linuxkpi/common/include/linux/bitops.h
									
		+6
		-6
	
												View File
												
				@@ -51,12 +51,6 @@

				#define	BITS_PER_TYPE(t)	(sizeof(t) * BITS_PER_BYTE)

				#define	BITS_TO_BYTES(n)	howmany((n), BITS_PER_BYTE)

				#define	hweight8(x)	bitcount((uint8_t)(x))

				#define	hweight16(x)	bitcount16(x)

				#define	hweight32(x)	bitcount32(x)

				#define	hweight64(x)	bitcount64(x)

				#define	hweight_long(x)	bitcountl(x)

				#if __has_builtin(__builtin_popcountg)

				#define	HWEIGHT8(x)	(__builtin_popcountg((uint8_t)(x)))

				#define	HWEIGHT16(x)	(__builtin_popcountg((uint16_t)(x)))

				@@ -70,6 +64,12 @@

				#define	HWEIGHT64(x)	(__const_bitcount64((uint64_t)(x)))

				#endif

				#define	hweight8(x)	(__builtin_constant_p(x) ? HWEIGHT8(x)  : bitcount((uint8_t)(x)))

				#define	hweight16(x)	(__builtin_constant_p(x) ? HWEIGHT16(x) : bitcount16(x))

				#define	hweight32(x)	(__builtin_constant_p(x) ? HWEIGHT32(x) : bitcount32(x))

				#define	hweight64(x)	(__builtin_constant_p(x) ? HWEIGHT64(x) : bitcount64(x))

				#define	hweight_long(x)	bitcountl(x)

				static inline int

				__ffs(int mask)

				{