[illumos-gate merge]

commit d7db73d165ff4802d277d375e93877471457fed7
    8493 kmem_move taskq appears to be inducing significant system latency
commit 8f022dd6c1ebe3edc269726bf537617e665df32f
    8967 libipmi: add support for GET_CHASSIS_STATUS command
    8974 fac_prov_ipmi should support binding by entity id and instance
    8975 ipmi topo plugin should automatically enumerate sensors on nodes it enumerates
    8976 ipmi enumerator should include FRU identity information in FMRI authority
    8977 ipmi enumerator doesn't always enumerate nested entities
    8978 Add topo facility method for controlling chassis ident indicator
commit c5fe87b82a0473350759338e29252322c7f49f28
    8760 troff: variable 'type' set but not used
commit d2aa06e8e95fc3abd82008cdd0959cbbdb2d50fb
    8652 Tautological comparisons with ZPROP_INVAL (followup)
commit da906b4e8cca4344750ec24c7007b5a3f26e8919
    8792 mac_tx_srs_quiesce() can kill a maxbw link

	Conflicts:
	usr/src/lib/libipmi/common/ipmi_misc.c
	usr/src/uts/common/os/kmem.c

5 files changed, 19 insertions, 22 deletions

diff --git a/usr/src/cmd/troff/n9.c b/usr/src/cmd/troff/n9.c
index 0d779e3acb..1fd3dc46fa 100644
--- a/usr/src/cmd/troff/n9.c
+++ b/usr/src/cmd/troff/n9.c
@@ -36,8 +36,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libintl.h>
 #include <stdlib.h>
 
@@ -72,7 +70,7 @@ int	csi_width[4] = {
  */
 
 tchar
-setz()
+setz(void)
 {
 	tchar i;
 
@@ -82,7 +80,7 @@ setz()
 }
 
 int
-setline()
+setline(void)
 {
 	tchar *i;
 	tchar c;
@@ -140,8 +138,7 @@ s1:
 
 
 int
-eat(c)
-int	c;
+eat(int c)
 {
 	int	i;
 
@@ -152,7 +149,7 @@ int	c;
 
 
 int
-setov()
+setov(void)
 {
 	int	j, k;
 	tchar i, o[NOV];
@@ -201,7 +198,7 @@ setov()
 
 
 int
-setbra()
+setbra(void)
 {
 	int	k;
 	tchar i, *j, dwn;
@@ -246,7 +243,7 @@ setbra()
 
 
 int
-setvline()
+setvline(void)
 {
 	int	i;
 	tchar c, rem, ver, neg;
@@ -308,10 +305,13 @@ setvline()
 
 #define	NPAIR	(NC/2-6)	/* max pairs in spline, etc. */
 
+/*
+ * Generate internal cookies for a drawing function.
+ */
 int
-setdraw()	/* generate internal cookies for a drawing function */
+setdraw(void)
 {
-	int i, j, k, dx[NPAIR], dy[NPAIR], delim, type;
+	int i, j, k, dx[NPAIR], dy[NPAIR], delim, type __unused;
 	tchar c, drawbuf[NC];
 
 	/* input is \D'f dx dy dx dy ... c' (or at least it had better be) */
@@ -387,7 +387,7 @@ setdraw()	/* generate internal cookies for a drawing function */
 
 
 int
-casefc()
+casefc(void)
 {
 	int	i;
 	tchar j;
@@ -408,8 +408,7 @@ casefc()
 
 
 tchar
-setfield(x)
-int	x;
+setfield(int x)
 {
 	tchar ii, jj, *fp;
 	int	i, j;
@@ -559,7 +558,7 @@ rtn:
 #ifdef NROFF
 /* locale specific initialization */
 int
-localize()
+localize(void)
 {
 	extern int	wdbindf();
 	extern wchar_t	*wddelim();
@@ -571,7 +570,7 @@ localize()
 		multi_locale = 1;
 	else {
 		if (*codeset == '\0' ||
-			(strcmp(codeset, ISO646) == 0)) {
+		    (strcmp(codeset, ISO646) == 0)) {
 			/*
 			 * if codeset is an empty string
 			 * assumes this is C locale (7-bit) locale.
diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c
index 5ca9a4e4f4..8d9c95b958 100644
--- a/usr/src/cmd/zpool/zpool_main.c
+++ b/usr/src/cmd/zpool/zpool_main.c
@@ -412,7 +412,7 @@ static int
 add_prop_list(const char *propname, char *propval, nvlist_t **props,
     boolean_t poolprop)
 {
-	zpool_prop_t prop = ZPROP_INVAL;
+	zpool_prop_t prop = ZPOOL_PROP_INVAL;
 	zfs_prop_t fprop;
 	nvlist_t *proplist;
 	const char *normnm;
@@ -430,7 +430,7 @@ add_prop_list(const char *propname, char *propval, nvlist_t **props,
 	if (poolprop) {
 		const char *vname = zpool_prop_to_name(ZPOOL_PROP_VERSION);
 
-		if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL &&
+		if ((prop = zpool_name_to_prop(propname)) == ZPOOL_PROP_INVAL &&
 		    !zpool_prop_feature(propname)) {
 			(void) fprintf(stderr, gettext("property '%s' is "
 			    "not a valid pool property\n"), propname);
diff --git a/usr/src/lib/libipmi/common/ipmi_misc.c b/usr/src/lib/libipmi/common/ipmi_misc.c
index 221093e630..78cea49895 100644
--- a/usr/src/lib/libipmi/common/ipmi_misc.c
+++ b/usr/src/lib/libipmi/common/ipmi_misc.c
@@ -224,7 +224,7 @@ ipmi_chassis_identify(ipmi_handle_t *ihp, boolean_t enable)
 }
 
 /*
- * calller is responsible for free'ing returned structure
+ * caller is responsible for free'ing returned structure
  */
 ipmi_chassis_status_t *
 ipmi_chassis_status(ipmi_handle_t *ihp)
diff --git a/usr/src/uts/common/io/mac/mac_datapath_setup.c b/usr/src/uts/common/io/mac/mac_datapath_setup.c
index de7dd0b716..4cf36b41a2 100644
--- a/usr/src/uts/common/io/mac/mac_datapath_setup.c
+++ b/usr/src/uts/common/io/mac/mac_datapath_setup.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright 2017, Joyent, Inc.
  */
 
 #include <sys/types.h>
diff --git a/usr/src/uts/common/os/kmem.c b/usr/src/uts/common/os/kmem.c
index 052bdb62ca..9fac8cb6b1 100644
--- a/usr/src/uts/common/os/kmem.c
+++ b/usr/src/uts/common/os/kmem.c
@@ -1060,8 +1060,6 @@ static vmem_t		*kmem_default_arena;
 static vmem_t		*kmem_firewall_va_arena;
 static vmem_t		*kmem_firewall_arena;
 
-static int		kmem_zerosized;		/* # of zero-sized allocs */
-
 /*
  * kmem slab consolidator thresholds (tunables)
  */