aboutsummaryrefslogtreecommitdiff
path: root/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
diff options
context:
space:
mode:
authorToomas Soome <tsoome@FreeBSD.org>2019-08-08 18:08:13 +0000
committerToomas Soome <tsoome@FreeBSD.org>2019-08-08 18:08:13 +0000
commitb1b93268466688ef41e6564804459945e3dd134d (patch)
tree955f512dbc522b9e68a9a9be6ac4410c4a911cf5 /sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
parent56abac3fc39ec44e4310782a8fe0ee90e71e419e (diff)
downloadsrc-b1b93268466688ef41e6564804459945e3dd134d.tar.gz
src-b1b93268466688ef41e6564804459945e3dd134d.zip
loader: support com.delphix:removing
We should support removing vdev from boot pool. Update loader zfs reader to support com.delphix:removing. Reviewed by: allanjude MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D18901
Notes
Notes: svn path=/head/; revision=350772
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
index ee6e55214ec7..675e4893aa1d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
@@ -383,7 +383,7 @@ extern unsigned char bcd_to_byte[256];
* High order bit is 31 (or 63 in _LP64 kernel).
*/
static __inline int
-highbit(ulong_t i)
+highbit(unsigned long i)
{
#if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL)
return (flsl(i));