D40706.1775903352.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40706.1775903352.diff
View Options

	Index: sys/contrib/openzfs/include/os/freebsd/spl/sys/sysmacros.h
	===================================================================
	--- sys/contrib/openzfs/include/os/freebsd/spl/sys/sysmacros.h
	+++ sys/contrib/openzfs/include/os/freebsd/spl/sys/sysmacros.h
	@@ -296,35 +296,7 @@
	static __inline int
	highbit(ulong_t i)
	{
	-#if defined(HAVE_INLINE_FLSL)
	return (flsl(i));
	-#else
	- int h = 1;
	-
	- if (i == 0)
	- return (0);
	-#ifdef _LP64
	- if (i & 0xffffffff00000000ul) {
	- h += 32; i >>= 32;
	- }
	-#endif
	- if (i & 0xffff0000) {
	- h += 16; i >>= 16;
	- }
	- if (i & 0xff00) {
	- h += 8; i >>= 8;
	- }
	- if (i & 0xf0) {
	- h += 4; i >>= 4;
	- }
	- if (i & 0xc) {
	- h += 2; i >>= 2;
	- }
	- if (i & 0x2) {
	- h += 1;
	- }
	- return (h);
	-#endif
	}

	/*
	@@ -334,33 +306,7 @@
	static __inline int
	highbit64(uint64_t i)
	{
	-#if defined(HAVE_INLINE_FLSLL)
	return (flsll(i));
	-#else
	- int h = 1;
	-
	- if (i == 0)
	- return (0);
	- if (i & 0xffffffff00000000ULL) {
	- h += 32; i >>= 32;
	- }
	- if (i & 0xffff0000) {
	- h += 16; i >>= 16;
	- }
	- if (i & 0xff00) {
	- h += 8; i >>= 8;
	- }
	- if (i & 0xf0) {
	- h += 4; i >>= 4;
	- }
	- if (i & 0xc) {
	- h += 2; i >>= 2;
	- }
	- if (i & 0x2) {
	- h += 1;
	- }
	- return (h);
	-#endif
	}

	#ifdef __cplusplus