From b1b93268466688ef41e6564804459945e3dd134d Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Thu, 8 Aug 2019 18:08:13 +0000
Subject: 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
---
sys/cddl/contrib/opensolaris/uts/common/os/list.c | 2 --
sys/cddl/contrib/opensolaris/uts/common/sys/list.h | 2 --
sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h | 2 --
sys/cddl/contrib/opensolaris/uts/common/sys/note.h | 2 --
sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h | 2 +-
5 files changed, 1 insertion(+), 9 deletions(-)
(limited to 'sys/cddl/contrib/opensolaris')
diff --git a/sys/cddl/contrib/opensolaris/uts/common/os/list.c b/sys/cddl/contrib/opensolaris/uts/common/os/list.c
index e8db13a5cf68..d9f467f461aa 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/os/list.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/os/list.c
@@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Generic doubly-linked list implementation
*/
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/list.h b/sys/cddl/contrib/opensolaris/uts/common/sys/list.h
index 8339b6226d11..6db92ed42955 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/list.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/list.h
@@ -26,8 +26,6 @@
#ifndef _SYS_LIST_H
#define _SYS_LIST_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/list_impl.h>
#ifdef __cplusplus
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h
index 9c42f8832023..a6614f9a38c2 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h
@@ -27,8 +27,6 @@
#ifndef _SYS_LIST_IMPL_H
#define _SYS_LIST_IMPL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#ifdef __cplusplus
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/note.h b/sys/cddl/contrib/opensolaris/uts/common/sys/note.h
index 2cb7fd89b7dd..6625b68d9eb4 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/note.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/note.h
@@ -39,8 +39,6 @@
#ifndef _SYS_NOTE_H
#define _SYS_NOTE_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
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));
--
cgit v1.2.3