[illumos-gate merge]release-20210128

commit beed421eff10640141fe8f9da29a5c8033a97f52
    13383 generalize check for serializing LFENCE
    13384 tsc_read() should use lfence when prudent
    13387 bhyve should expose lfence serialize in DE_CFG MSR
commit 78801af7286cd73dbc996d470f789e75993cf15d
    13365 Add option to testrunner to re-run just failed tests
commit 2d84dc94714fa18a51c85173f806acbc2d1b4257
    13360 loader: use BGRA RBG data in gfx functions
commit a98e9e2e16f7c0305e8538246f8f8464517b3884
    13432 idm: symbol 'idm' is multiply-defined
commit a35d0bb9919a1ab99b0305e759552bef6a8bd053
    13431 rdsib: multiply-defined symbols
commit 245cbc655bd26e8de57809bc109b82105a30693d
    13430 scsi_vhci: multiply-defined symbols
commit 9868091de5a69073a55e3b8cc1a378cac9220edf
    13429 nge: multiply-defined symbols
commit 6626685934fc28e358a8038d599be9e53aa0715e
    13428 rdsv3: symbol 'rdsv3_one_sec_in_hz' is multiply-defined
commit 734e1f66c3254ea498ea4ce3fe6dc7e6f9f293ff
    13473 svccfg: dirs for manifests are manifest not manifests
commit 4f1c2d80debdaa7ad92b0677c6c86fb6b782e811
    13425 i86xpv: multiply-defined symbols

Conflicts:
    usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh

5 files changed, 40 insertions, 17 deletions

diff --git a/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h b/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h
index 5e2f419600..164af2aa7a 100644
--- a/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h
+++ b/usr/src/uts/common/sys/ib/clients/rds/rdsib_buf.h
@@ -75,8 +75,6 @@
 #ifndef _RDSIB_BUF_H
 #define	_RDSIB_BUF_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -149,8 +147,8 @@ typedef struct rds_bufpool_s {
 } rds_bufpool_t;
 
 /* Global pools of buffers */
-rds_bufpool_t		rds_dpool; /* data pool */
-rds_bufpool_t		rds_cpool; /* ctrl pool */
+extern rds_bufpool_t	rds_dpool; /* data pool */
+extern rds_bufpool_t	rds_cpool; /* ctrl pool */
 
 /* defined in rds_buf.c */
 int rds_init_recv_caches(rds_state_t *statep);
diff --git a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h
index 56b92f8037..c462306418 100644
--- a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h
+++ b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_impl.h
@@ -117,7 +117,7 @@ typedef unsigned int	atomic_t;
 #define	clear_le_bit(b, p)	clear_bit(b ^ LE_BIT_XOR, p)
 #define	test_le_bit(b, p)	test_bit(b ^ LE_BIT_XOR, p)
 
-uint_t	rdsv3_one_sec_in_hz;
+extern uint_t	rdsv3_one_sec_in_hz;
 
 #define	jiffies	100
 #define	HZ	(drv_hztousec(1))
diff --git a/usr/src/uts/common/sys/idm/idm_impl.h b/usr/src/uts/common/sys/idm/idm_impl.h
index 346611719d..1e816ee211 100644
--- a/usr/src/uts/common/sys/idm/idm_impl.h
+++ b/usr/src/uts/common/sys/idm/idm_impl.h
@@ -472,7 +472,7 @@ typedef struct {
 	kmem_cache_t	*idm_so_128k_buf_cache;
 } idm_global_t;
 
-idm_global_t	idm; /* Global state */
+extern idm_global_t	idm; /* Global state */
 
 int
 idm_idpool_create(idm_idpool_t	*pool);
diff --git a/usr/src/uts/common/sys/mhd.h b/usr/src/uts/common/sys/mhd.h
index 66d57266ad..3d7e0d5d5a 100644
--- a/usr/src/uts/common/sys/mhd.h
+++ b/usr/src/uts/common/sys/mhd.h
@@ -27,8 +27,6 @@
 #ifndef _SYS_MHD_H
 #define	_SYS_MHD_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -41,8 +39,8 @@ extern "C" {
 #define	MHIOCTKOWN			(MHIOC|2)
 #define	MHIOCRELEASE			(MHIOC|3)
 #define	MHIOCSTATUS			(MHIOC|4)
-#define	MHIOCGRP_INKEYS 		(MHIOC|5)
-#define	MHIOCGRP_INRESV 		(MHIOC|6)
+#define	MHIOCGRP_INKEYS			(MHIOC|5)
+#define	MHIOCGRP_INRESV			(MHIOC|6)
 #define	MHIOCGRP_REGISTER		(MHIOC|7)
 #define	MHIOCGRP_RESERVE		(MHIOC|8)
 #define	MHIOCGRP_PREEMPTANDABORT	(MHIOC|9)
@@ -79,13 +77,13 @@ typedef struct mhioc_inkeys {
 } mhioc_inkeys_t;
 
 #if defined(_SYSCALL32)
-struct mhioc_key_list32 {
+typedef struct mhioc_key_list32 {
 	uint32_t		listsize;
 	uint32_t		listlen;
 	caddr32_t		list;
 } mhioc_key_list32_t;
 
-struct mhioc_inkeys32 {
+typedef struct mhioc_inkeys32 {
 	uint32_t		generation;
 	caddr32_t		li;
 } mhioc_inkeys32_t;
@@ -110,7 +108,7 @@ typedef struct mhioc_inresvs {
 } mhioc_inresvs_t;
 
 #if defined(_SYSCALL32)
-struct mhioc_resv_desc_list32 {
+typedef struct mhioc_resv_desc_list32 {
 	uint32_t		listsize;
 	uint32_t		listlen;
 	caddr32_t		list;
diff --git a/usr/src/uts/common/sys/rgb.h b/usr/src/uts/common/sys/rgb.h
index 9ddfaa9e3f..6e0ba29af2 100644
--- a/usr/src/uts/common/sys/rgb.h
+++ b/usr/src/uts/common/sys/rgb.h
@@ -23,6 +23,13 @@ extern "C" {
 #endif
 
 /*
+ * Number of "base" colors is 16, 8 dark and 8 bright/light.
+ * Color map size for indexed colors is 256, to support VGA 256-color modes.
+ */
+#define	NCOLORS		16
+#define	NCMAP		256
+
+/*
  * Color data from bootloader.
  */
 typedef struct rgb_color {
@@ -37,9 +44,9 @@ typedef struct rgb {
 } rgb_t;
 
 typedef struct {
-	uint8_t red[16];
-	uint8_t green[16];
-	uint8_t blue[16];
+	uint8_t red[NCOLORS];
+	uint8_t green[NCOLORS];
+	uint8_t blue[NCOLORS];
 } text_cmap_t;
 
 extern const text_cmap_t cmap4_to_24;
@@ -67,10 +74,30 @@ typedef enum pc_colors {
 	pc_brt_white	= 15
 } pc_colors_t;
 
+typedef enum sun_colors {
+	sun_brt_white	= 0,
+	sun_black	= 1,
+	sun_blue	= 2,
+	sun_green	= 3,
+	sun_cyan	= 4,
+	sun_red		= 5,
+	sun_magenta	= 6,
+	sun_brown	= 7,
+	sun_white	= 8,
+	sun_grey	= 9,
+	sun_brt_blue	= 10,
+	sun_brt_green	= 11,
+	sun_brt_cyan	= 12,
+	sun_brt_red	= 13,
+	sun_brt_magenta	= 14,
+	sun_yellow	= 15,
+} sun_colors_t;
+
 #define	XLATE_NCOLORS	8
 extern const uint8_t dim_xlate[XLATE_NCOLORS];
 extern const uint8_t brt_xlate[XLATE_NCOLORS];
-extern const uint8_t solaris_color_to_pc_color[16];
+extern const uint8_t solaris_color_to_pc_color[NCOLORS];
+extern const uint8_t pc_color_to_solaris_color[NCOLORS];
 
 extern uint32_t rgb_color_map(const rgb_t *, uint8_t);