Index: sys/compat/linuxkpi/common/include/linux/bitops.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/bitops.h
+++ sys/compat/linuxkpi/common/include/linux/bitops.h
@@ -62,10 +62,10 @@
 #define	hweight64(x)	bitcount64(x)
 #define	hweight_long(x)	bitcountl(x)
 
-#define	HWEIGHT8(x)	(bitcount8((uint8_t)(x)) + 1)
-#define	HWEIGHT16(x)	(bitcount16(x) + 1)
-#define	HWEIGHT32(x)	(bitcount32(x) + 1)
-#define	HWEIGHT64(x)	(bitcount64(x) + 1)
+#define	HWEIGHT8(x)	(__builtin_popcountg((uint8_t)(x)) + 1)
+#define	HWEIGHT16(x)	(__builtin_popcountg((uint16_t)(x)) + 1)
+#define	HWEIGHT32(x)	(__builtin_popcountg((uint32_t)(x)) + 1)
+#define	HWEIGHT64(x)	(__builtin_popcountg((uint64_t)(x)) + 1)
 
 static inline int
 __ffs(int mask)