[illumos-gate merge]

commit 0a554e9f2c0d440dc40a97fae2d18f1d428ca786
    13404 man page spelling errors
commit 9f76c6ed5b6ee0cc0bf631daca15ac3dc5fc70c4
    13400 zfs-tests: implicit conversion from 'enum dmu_objset_type' to 'enum lzc_dataset_type'
commit ef96fc31fc4f4306719704352d5c3e33573c039f
    13399 zfs: error: implicit conversion from 'boolean_t' to 'ds_hold_flags_t'
commit 56870e8c76c2675bcef1fcee5d519585ce9c768e
    13393 cheetah: case value '47616' not in enumerated type
commit 8247326397b1a16f37e70cf13f5b7a4f50d06712
    13403 zfs: symbol 'g_zfs' is multiply-defined
commit 436b964b19ef06803ad9165542d80d9d731d6486
    13402 zpool: symbol 'g_zfs' is multiply-defined
commit 99308ed0417a2b8ab73c5856a8a5345ce2a7aea7
    13396 PoolsExecption typo in resource pools javadoc
commit 1575b751c16622553e958c1e5c45e59c86b15c6e
    13392 px: case value '3' not in enumerated type
commit 9b0429a10eec9313ec782d8421272aff70adbfdc
    13339 Add support for Hygon Dhyana Family 18h processor
commit d20422bd742384b77102bb3bd09e0dc4b7372e50
    13351 loader: vbe_find_mode_xydm() is using wrong safety and iteration is buggy
commit 174b8e455f9a6974e69fa4e28792580acde0892d
    13311 uptime(1) dazed and confused for a minute after boot
commit f816551bb187d104fbf2757703d7a5d2189a3a18
    13401 eeprom: 'lv' may be used uninitialized in this function
commit 5e96da73c99d9d17ff5a58b793fff2ab6dcadf25
    13391 fm: build errors with gcc 7 on SPARC
commit 58b55f701e285559e4799354996fd284238ed0d4
    13398 libstand: xdrproc_t should return bool
commit c6a28d7650029501a356f7b75b2a10a5c4430cef
    13394 fhc: case value '4294967295' not in enumerated type
commit 58d4b16fe601073f2408de78e3db7e9bfa9abfd2
    13355 remove topo module warning gags
commit 1473b8d60e902819558a8b0e8a257eb0d754c3c3
    13388 ZFS list bookmark not working on zvols
commit 4bba12ca5cd6f92aaf0d4c0d19d05528110bc095
    13368 libbe_py should support temporary BE activation
commit a92282e44f968185a6bba094d1e5fece2da819cf
    13376 fm: variable may be used uninitialized
commit 8b1df8bf71b7b62e7e4d46fe6b457d4d6447b2b8
    13367 beadm activate -t should not promote new BE datasets
commit 9704bf7fb82e71b685e194a967937ff03843e73a
    13317 Decrease contention on dn_struct_rwlock
commit 88a08813800ed7ba7c927986421cee437f7f2233
    13363 ctfconvert could support more granular ignore for missing debug data
commit 3dd4cd56e7843e01a8ab147a0d102cd4f6d732c1
    13342 ctfconvert could encode _Float128 for 32-bit objects
commit 73197b540cc5f0434c409b68ca9e1a514a6ce91b
    13336 ctfconvert should be able to unconditionally attempt conversion
commit dd4422524768709a579a2a93a10c78a88a6b0ecb
    13280 CTF: provide option to truncate and continue

Conflicts & other fixes (with help from Jason King <jbk@joyent.com>):
    usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
    usr/src/lib/libctf/common/ctf_convert.c
    usr/src/lib/libctf/common/ctf_lib.c
    usr/src/lib/libctf/common/libctf.h
    usr/src/lib/libproc/common/Psymtab.c
    usr/src/man/man1/ld.so.1.1
    usr/src/man/man4/process.4

11 files changed, 33 insertions, 25 deletions

diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin
index c42c02da80..c9203cd639 100644
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin
+++ b/usr/src/lib/fm/topo/modules/Makefile.plugin
@@ -55,9 +55,6 @@ arch_ROOTCONF = $(ROOT)/usr/platform/$(ARCH)/lib/fm/topo/plugins/$(CONF)
 plat_ROOTCONF = $(PLATFORMS:%=$(ROOT)/usr/platform/%/lib/fm/topo/plugins/$(CONF))
 ROOTCONF = $($(CLASS)_ROOTCONF)
 
-CERRWARN += $(CNOWARN_UNINIT)
-CERRWARN += -_gcc=-Wno-parentheses
-
 APIMAP = ../../../libtopo/common/topo_mod.map
 MAPFILES =		# use APIMAP instead
 
diff --git a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c
index 7c9027517d..0f4e03b813 100644
--- a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c
+++ b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c
@@ -1165,6 +1165,7 @@ disk_status(topo_mod_t *mod, tnode_t *nodep, topo_version_t vers,
 	 */
 	if (nvlist_lookup_string(in_nvl, "path", &fullpath) == 0) {
 		devpath = NULL;
+		pathlen = 0;
 	} else {
 		/*
 		 * Get the /devices path and attempt to open the disk status
diff --git a/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c b/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
index 8e867a447b..981596e4dc 100644
--- a/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
+++ b/usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
@@ -454,6 +454,12 @@ ipmi_check_entity(ipmi_handle_t *ihp, ipmi_entity_t *ep, void *data)
 	case IPMI_ET_FAN:
 		labelname = "FAN";
 		break;
+
+	default:
+		topo_mod_dprintf(mod, "unknown entity type, %u: cannot set "
+		    "label name", edp->ed_entity);
+		nvlist_free(fmri);
+		return (1);
 	}
 
 	len = strlen(label);
@@ -631,7 +637,7 @@ ipmi_enum_sp(topo_mod_t *mod, tnode_t *pnode)
 	char ipv4_addr[INET_ADDRSTRLEN], subnet[INET_ADDRSTRLEN];
 	char gateway[INET_ADDRSTRLEN], macaddr[18];
 	char ipv6_addr[INET6_ADDRSTRLEN];
-	char **ipv6_routes;
+	char **ipv6_routes = NULL;
 	const char *sp_rev, *ipv4_cfgtype, *ipv6_cfgtype;
 	nvlist_t *auth, *fmri;
 	tnode_t *sp_node;
diff --git a/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c b/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c
index cd272a0c73..8478bd72db 100644
--- a/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c
+++ b/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c
@@ -251,6 +251,8 @@ nic_create_transceiver(topo_mod_t *mod, tnode_t *pnode, dladm_handle_t handle,
 	case NIC_PORT_SFF:
 		ret = port_create_sff(mod, pnode, tranid, &port);
 		break;
+	default:
+		return (-1);
 	}
 
 	if ((ret = nic_port_datalink_props(mod, port, handle, linkid)) != 0)
diff --git a/usr/src/lib/fm/topo/modules/common/pcibus/pcibus.c b/usr/src/lib/fm/topo/modules/common/pcibus/pcibus.c
index b2b56e5eea..92c5b721e9 100644
--- a/usr/src/lib/fm/topo/modules/common/pcibus/pcibus.c
+++ b/usr/src/lib/fm/topo/modules/common/pcibus/pcibus.c
@@ -671,7 +671,7 @@ declare_dev_and_fn(topo_mod_t *mod, tnode_t *bus, tnode_t **dev, di_node_t din,
 	tnode_t *fn;
 	uint_t class, subclass;
 	uint_t vid, did;
-	uint_t pdev_sz;
+	uint_t pdev_sz = 0;
 	did_t *dp = NULL;
 
 	if (*dev == NULL) {
diff --git a/usr/src/lib/fm/topo/modules/common/pcibus/pcibus_labels.c b/usr/src/lib/fm/topo/modules/common/pcibus/pcibus_labels.c
index 1a767312a1..254cae00c3 100644
--- a/usr/src/lib/fm/topo/modules/common/pcibus/pcibus_labels.c
+++ b/usr/src/lib/fm/topo/modules/common/pcibus/pcibus_labels.c
@@ -127,7 +127,7 @@ pci_label_slotname_lookup(topo_mod_t *mod, char *platform,
 					topo_mod_dprintf(mod,
 					    "%s: calling test function=%p\n",
 					    __func__, rw.srw_test);
-					if (ret = rw.srw_test(mod, dp))
+					if ((ret = rw.srw_test(mod, dp)) != 0)
 						rlabel = rw.srw_new;
 					topo_mod_dprintf(mod,
 					    "%s: test function return=%d\n",
@@ -192,7 +192,7 @@ pci_label_missing_lookup(topo_mod_t *mod, char *platform, did_t *dp)
 					topo_mod_dprintf(mod,
 					    "%s: calling test function=%p\n",
 					    __func__, m.dl_test);
-					if (ret = m.dl_test(mod, dp))
+					if ((ret = m.dl_test(mod, dp)) != 0)
 						rlabel = m.dl_label;
 					topo_mod_dprintf(mod,
 					    "%s: test function return=%d\n",
@@ -222,7 +222,7 @@ pci_slot_label_lookup(topo_mod_t *mod, tnode_t *node, did_t *dp, did_t *pdp)
 {
 	tnode_t *anode, *apnode;
 	did_t *adp, *apdp;
-	char *plat, *pp, *l, *ancestor_l = NULL, *new_l = NULL;
+	char *plat, *pp, *l = NULL, *ancestor_l = NULL, *new_l = NULL;
 	int err, b, d, f, done = 0;
 	size_t len;
 
diff --git a/usr/src/lib/fm/topo/modules/common/shared/topo_sensor.c b/usr/src/lib/fm/topo/modules/common/shared/topo_sensor.c
index a716c57a66..3cf969d697 100644
--- a/usr/src/lib/fm/topo/modules/common/shared/topo_sensor.c
+++ b/usr/src/lib/fm/topo/modules/common/shared/topo_sensor.c
@@ -260,7 +260,7 @@ topo_sensor_create_scalar_sensor(topo_mod_t *mod, tnode_t *pnode,
 	    reader_arg, &err) != 0) {
 		topo_mod_dprintf(mod, "failed to set argument for sensor %s: "
 		    "%s", path, topo_strerror(err));
-		err = topo_mod_seterrno(mod, err);
+		ret = topo_mod_seterrno(mod, err);
 		goto out;
 	}
 
diff --git a/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c b/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c
index d9a8eca7b8..0ac0523cf6 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c
+++ b/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c
@@ -467,10 +467,10 @@ amd_dimm_create(topo_mod_t *mod, uint16_t chip_smbid, tnode_t *pnode,
 	nvlist_t *fmri, **dimmarr = NULL;
 	uint64_t num;
 	uint_t ndimm;
-	id_t smbid;
-	const char *serial;
-	const char *part;
-	const char *rev;
+	id_t smbid = -1;
+	const char *serial = NULL;
+	const char *part = NULL;
+	const char *rev = NULL;
 
 	if (nvlist_lookup_nvlist_array(mc, "dimmlist", &dimmarr, &ndimm) != 0) {
 		whinge(mod, NULL, "amd_dimm_create: dimmlist lookup failed\n");
@@ -562,10 +562,10 @@ amd_dimm_create(topo_mod_t *mod, uint16_t chip_smbid, tnode_t *pnode,
 
 		for (nvp = nvlist_next_nvpair(dimmarr[i], NULL); nvp != NULL;
 		    nvp = nvlist_next_nvpair(dimmarr[i], nvp)) {
-			if (nvpair_type(nvp) == DATA_TYPE_UINT64_ARRAY &&
-			    strcmp(nvpair_name(nvp), "csnums") == 0 ||
-			    nvpair_type(nvp) == DATA_TYPE_STRING_ARRAY &&
-			    strcmp(nvpair_name(nvp), "csnames") == 0)
+			if ((nvpair_type(nvp) == DATA_TYPE_UINT64_ARRAY &&
+			    strcmp(nvpair_name(nvp), "csnums") == 0) ||
+			    (nvpair_type(nvp) == DATA_TYPE_STRING_ARRAY &&
+			    strcmp(nvpair_name(nvp), "csnames") == 0))
 				continue;	/* used in amd_rank_create() */
 
 			nerr += nvprop_add(mod, nvp, PGNAME(DIMM), dimmnode);
diff --git a/usr/src/lib/fm/topo/modules/i86pc/chip/chip_intel.c b/usr/src/lib/fm/topo/modules/i86pc/chip/chip_intel.c
index df6e2b6f95..4168a3516e 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/chip/chip_intel.c
+++ b/usr/src/lib/fm/topo/modules/i86pc/chip/chip_intel.c
@@ -200,7 +200,7 @@ mc_add_dimms(topo_mod_t *mod, uint16_t chip_smbid, tnode_t *pnode,
 	char *rev = NULL;
 	char *label = NULL;
 	char *name;
-	id_t smbid;
+	id_t smbid = -1;
 
 	if (topo_node_range_create(mod, pnode, DIMM, 0,
 	    maxdimms ? maxdimms-1 : ndimms-1) < 0) {
diff --git a/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c b/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c
index 37faa04d1e..00ae460ccf 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c
@@ -200,13 +200,14 @@ mem_get_dimm_by_sn(char *sn, md_mem_info_t *mem)
 
 mem_grp_t *
 find_grp(mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
-    mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem) {
-
+    mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem)
+{
 	mem_grp_t *mg;
 	mem_bank_map_t *bp;
 	size_t i, j;
 	int err;
 
+	err = 0;
 	for (mg = mem->mem_group; mg != NULL; mg = mg->mg_next) {
 		if (mg->mg_size == n) {
 			err = 0;
@@ -220,9 +221,9 @@ find_grp(mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
 				}
 				if (bp == NULL) err++;
 			}
-		}
-		else
+		} else {
 			err++;
+		}
 		if (err == 0)
 			return (mg);
 	}
@@ -231,8 +232,8 @@ find_grp(mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
 
 mem_grp_t *
 create_grp(topo_mod_t *mod, mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
-    mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem) {
-
+    mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem)
+{
 	mem_grp_t *mg;
 	size_t i, j;
 
diff --git a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c
index b31eb28683..60ceb89b21 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c
@@ -355,6 +355,7 @@ pi_get_chassisid(topo_mod_t *mod, md_t *mdp, mde_cookie_t mde_node)
 	    num_nodes, MD_STR_COMPONENT);
 
 	idx = 0;
+	result = 0;
 	while (id == NULL && idx < num_nodes) {
 		hc_name = pi_get_topo_hc_name(mod, mdp, chassis_nodes[idx]);
 		if (hc_name != NULL && strcmp(hc_name, MD_STR_CHASSIS) == 0) {
@@ -976,7 +977,7 @@ int
 pi_set_auth(topo_mod_t *mod, md_t *mdp, mde_cookie_t mde_node,
     tnode_t *t_parent, tnode_t *t_node)
 {
-	int 		result;
+	int		result;
 	int		err;
 	nvlist_t	*auth;
 	char		*val = NULL;