mergegcc9

3 files changed, 24 insertions, 24 deletions

diff --git a/usr/src/uts/sun4v/sys/ds_impl.h b/usr/src/uts/sun4v/sys/ds_impl.h
index a2a06d21a3..00e8ba7680 100644
--- a/usr/src/uts/sun4v/sys/ds_impl.h
+++ b/usr/src/uts/sun4v/sys/ds_impl.h
@@ -196,7 +196,7 @@ typedef struct ds_port {
 	uint32_t	ver_idx;	/* index of version during handshake */
 	ds_ldc_t	ldc;		/* LDC for this port */
 	ds_domain_hdl_t	domain_hdl;	/* LDOMs domain hdl assoc. with port */
-	char 		*domain_name;	/* LDOMs domain name assoc. with port */
+	char		*domain_name;	/* LDOMs domain name assoc. with port */
 } ds_port_t;
 
 #define	IS_DS_PORT(port)	1	/* VBSC code compatability */
@@ -404,7 +404,7 @@ typedef struct ds_log_entry {
 #define	DS_LOG_POOL_END		(ds_log_entry_pool + DS_LOG_NPOOL)
 
 #define	DS_IS_POOL_ENTRY(ep)	(((ep) >= ds_log_entry_pool) && \
-				((ep) <= &(ds_log_entry_pool[DS_LOG_NPOOL])))
+				((ep) < &(ds_log_entry_pool[DS_LOG_NPOOL])))
 
 /* VBSC code compatability related defines */
 
@@ -554,8 +554,8 @@ void ds_dump_msg(void *buf, size_t len);
 #define	DS_DUMP_MSG(flags, buf, len)
 #define	DS_DUMP_LDC_MSG(buf, len)
 
-#define	DS_BADHDL1			NULL
-#define	DS_BADHDL2			NULL
+#define	DS_BADHDL1			(ds_svc_hdl_t)0
+#define	DS_BADHDL2			(ds_svc_hdl_t)0
 
 #endif /* DEBUG */
 
diff --git a/usr/src/uts/sun4v/sys/ldc_impl.h b/usr/src/uts/sun4v/sys/ldc_impl.h
index 4acea4f84f..be381ad018 100644
--- a/usr/src/uts/sun4v/sys/ldc_impl.h
+++ b/usr/src/uts/sun4v/sys/ldc_impl.h
@@ -229,7 +229,7 @@ typedef struct ldc_msg {
 			uint8_t		_type;	/* Message type */
 			uint8_t		_stype;	/* Message subtype */
 			uint8_t		_ctrl;	/* Control/Error Message */
-			uint8_t 	_env;	/* Message Envelope */
+			uint8_t		_env;	/* Message Envelope */
 			uint32_t	_seqid;	/* Sequence ID */
 
 			union {
@@ -285,7 +285,7 @@ typedef union {
 				pgszc:4;	/* <3:0> pgsz code */
 	} mte_bit;
 
-	uint64_t 		ll;
+	uint64_t		ll;
 
 } ldc_mte_t;
 
@@ -300,8 +300,8 @@ typedef union {
 #define	mte_pgszc	mte_bit.pgszc
 
 #define	MTE_BSZS_SHIFT(sz)	((sz) * 3)
-#define	MTEBYTES(sz)    	(MMU_PAGESIZE << MTE_BSZS_SHIFT(sz))
-#define	MTEPAGES(sz)    	(1 << MTE_BSZS_SHIFT(sz))
+#define	MTEBYTES(sz)		(MMU_PAGESIZE << MTE_BSZS_SHIFT(sz))
+#define	MTEPAGES(sz)		(1 << MTE_BSZS_SHIFT(sz))
 #define	MTE_PAGE_SHIFT(sz)	(MMU_PAGESHIFT + MTE_BSZS_SHIFT(sz))
 #define	MTE_PAGE_OFFSET(sz)	(MTEBYTES(sz) - 1)
 #define	MTE_PAGEMASK(sz)	(~MTE_PAGE_OFFSET(sz))
@@ -400,7 +400,7 @@ typedef struct ldc_dring {
 	ldc_mem_handle_t	mhdl;		/* Mem handle to desc ring */
 
 	struct ldc_dring	*ch_next;	/* Next dring in channel */
-	struct ldc_dring 	*next;		/* Next dring overall */
+	struct ldc_dring	*next;		/* Next dring overall */
 
 } ldc_dring_t;
 
@@ -493,11 +493,11 @@ struct ldc_chan {
  * LDC module soft state structure
  */
 typedef struct ldc_soft_state {
-	kmutex_t 	lock;		/* Protects ldc_soft_state_t  */
+	kmutex_t	lock;		/* Protects ldc_soft_state_t  */
 	ldc_cnex_t	cinfo;		/* channel nexus info */
 	uint64_t	channel_count;	/* Number of channels */
 	uint64_t	channels_open;	/* Number of open channels */
-	ldc_chan_t 	*chan_list;	/* List of LDC endpoints */
+	ldc_chan_t	*chan_list;	/* List of LDC endpoints */
 	ldc_dring_t	*dring_list;	/* Descriptor rings (for export) */
 
 	kmem_cache_t	*memhdl_cache;	/* Memory handle cache */
@@ -522,9 +522,9 @@ if (ldcdbg & 0x02)	\
 if (ldcdbg & 0x04)	\
 	ldcdebug
 #else
-#define	D1
-#define	D2
-#define	DWARN
+#define	D1(...)
+#define	D2(...)
+#define	DWARN(...)
 #endif
 
 #ifdef __cplusplus
diff --git a/usr/src/uts/sun4v/sys/vnet.h b/usr/src/uts/sun4v/sys/vnet.h
index 81b958fedf..04d2df006a 100644
--- a/usr/src/uts/sun4v/sys/vnet.h
+++ b/usr/src/uts/sun4v/sys/vnet.h
@@ -90,16 +90,16 @@ typedef struct vnet_hio_kstats {
 	kstat_named_t	oerrors;
 
 	/* required by kstat for MIB II objects(RFC 1213) */
-	kstat_named_t	rbytes; 	/* MIB - ifInOctets */
+	kstat_named_t	rbytes;		/* MIB - ifInOctets */
 	kstat_named_t	rbytes64;
-	kstat_named_t	obytes; 	/* MIB - ifOutOctets */
+	kstat_named_t	obytes;		/* MIB - ifOutOctets */
 	kstat_named_t	obytes64;
-	kstat_named_t	multircv; 	/* MIB - ifInNUcastPkts */
-	kstat_named_t	multixmt; 	/* MIB - ifOutNUcastPkts */
+	kstat_named_t	multircv;	/* MIB - ifInNUcastPkts */
+	kstat_named_t	multixmt;	/* MIB - ifOutNUcastPkts */
 	kstat_named_t	brdcstrcv;	/* MIB - ifInNUcastPkts */
 	kstat_named_t	brdcstxmt;	/* MIB - ifOutNUcastPkts */
-	kstat_named_t	norcvbuf; 	/* MIB - ifInDiscards */
-	kstat_named_t	noxmtbuf; 	/* MIB - ifOutDiscards */
+	kstat_named_t	norcvbuf;	/* MIB - ifInDiscards */
+	kstat_named_t	noxmtbuf;	/* MIB - ifOutDiscards */
 } vnet_hio_kstats_t;
 
 typedef struct vnet_tx_ring_stats {
@@ -348,10 +348,10 @@ enum	{ DBG_LEVEL1 = 0x01, DBG_LEVEL2 = 0x02, DBG_WARN = 0x04,
 
 #else
 
-#define	DBG1(...)	if (0)	do { } while (0)
-#define	DBG2(...)	if (0)	do { } while (0)
-#define	DWARN(...)	if (0)	do { } while (0)
-#define	DERR(...)	if (0)	do { } while (0)
+#define	DBG1(...)
+#define	DBG2(...)
+#define	DWARN(...)
+#define	DERR(...)
 
 #endif