[illumos-gate merge]

commit 78a53e201c2691debc57ede24c524118299ab18c
    10687 Service routine cast changes need smatch fixes
commit ef623aa14b0dc34c6b9edb213cbcda88461ecfc3
    10680 fasttrap: NULL pointer errors
commit 314d13c90091499eb12548353dfa2d2ca0b0b840
    10679 dcpc: NULL pointer errors
commit f7ecc608dd732e7b1f2760725ded79c8afba20bd
    10678 dtrace: NULL pointer errors
commit cd717361fac4e95d6ef3d8ce64cbaaeeddf8725c
    10677 systrace: NULL pointer errors
commit 68deb3360e8e161517e8eda768aa13357247893e
    10676 fbt: NULL pointer errors
commit fa30bfac67a47bb941ce78809508c530f9853f0a
    10675 sdt: NULL pointer issues
commit fd826efa0fbcbc82b734a8db80a074204cf11b22
    10686 Debug macros causes smatch issues
commit 58447f688d5e308373ab16a3b129bc0ba0fbc154
    10701 Correct lock ASSERTs in vdev_label_read/write

22 files changed, 190 insertions, 155 deletions

diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index 57597ad909..191bf0c74a 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@@ -237,6 +237,12 @@ include $(SRC)/Makefile.smatch
 #
 SMOFF += sizeof
 
+#
+# DEBUG-only macros that define away to nothing confuse this check,
+# unfortunately.
+#
+$(RELEASE_BUILD)SMOFF += indenting
+
 CSTD = $(CSTD_GNU99)
 
 CFLAGS_uts		=
diff --git a/usr/src/uts/common/dtrace/dcpc.c b/usr/src/uts/common/dtrace/dcpc.c
index 8fd96cc24c..9da817537c 100644
--- a/usr/src/uts/common/dtrace/dcpc.c
+++ b/usr/src/uts/common/dtrace/dcpc.c
@@ -1104,7 +1104,7 @@ dcpc_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "dcpc", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE ||
+	    DDI_PSEUDO, 0) == DDI_FAILURE ||
 	    dtrace_register("cpc", &dcpc_attr, DTRACE_PRIV_KERNEL,
 	    NULL, &dcpc_pops, NULL, &dcpc_pid) != 0) {
 		ddi_remove_minor_node(devi, NULL);
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c
index 8184bc27b9..8d5ccdc64b 100644
--- a/usr/src/uts/common/dtrace/dtrace.c
+++ b/usr/src/uts/common/dtrace/dtrace.c
@@ -3134,7 +3134,7 @@ dtrace_dif_varstr(uintptr_t addr, dtrace_state_t *state,
 	if (mstate->dtms_scratch_ptr + strsz >
 	    mstate->dtms_scratch_base + mstate->dtms_scratch_size) {
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-		return (NULL);
+		return (0);
 	}
 
 	dtrace_strcpy((const void *)addr, (void *)mstate->dtms_scratch_ptr,
@@ -3209,7 +3209,7 @@ dtrace_dif_variable(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t v,
 
 		if ((lwp = curthread->t_lwp) == NULL) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = NULL;
+			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = 0;
 			return (0);
 		}
 
@@ -3352,7 +3352,7 @@ dtrace_dif_variable(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t v,
 			 * uint64_t will contain the caller, which is what
 			 * we're after.
 			 */
-			ustack[2] = NULL;
+			ustack[2] = 0;
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			dtrace_getupcstack(ustack, 3);
 			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
@@ -3579,7 +3579,7 @@ dtrace_dif_variable_write(dtrace_mstate_t *mstate, dtrace_state_t *state,
 
 		if ((lwp = curthread->t_lwp) == NULL) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = NULL;
+			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = 0;
 			return;
 		}
 
@@ -4083,7 +4083,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 	case DIF_SUBR_MUTEX_OWNED:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4097,7 +4097,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 	case DIF_SUBR_MUTEX_OWNER:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4112,7 +4112,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 	case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4123,7 +4123,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 	case DIF_SUBR_MUTEX_TYPE_SPIN:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4136,7 +4136,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4148,7 +4148,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 	case DIF_SUBR_RW_WRITE_HELD:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4159,7 +4159,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 	case DIF_SUBR_RW_ISWRITER:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4183,7 +4183,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		}
 
 		if (!dtrace_canload(src, size, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4211,7 +4211,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		if (scratch_size < size ||
 		    !DTRACE_INSCRATCH(mstate, scratch_size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4261,7 +4261,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		 */
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4282,11 +4282,11 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		size_t count = 0;
 		int cont = 0;
 
-		while (baddr != NULL && !(*flags & CPU_DTRACE_FAULT)) {
+		while (baddr != 0 && !(*flags & CPU_DTRACE_FAULT)) {
 
 			if (!dtrace_canload(baddr, sizeof (mblk_t), mstate,
 			    vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -4396,7 +4396,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		size_t lim;
 
 		if (!dtrace_strcanload(addr, size, &lim, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 		regs[rd] = dtrace_strlen((char *)addr, lim);
@@ -4420,12 +4420,12 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		char c, target = (char)tupregs[1].dttk_value;
 
 		if (!dtrace_strcanload(addr, size, &lim, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 		addr_limit = addr + lim;
 
-		for (regs[rd] = NULL; addr < addr_limit; addr++) {
+		for (regs[rd] = 0; addr < addr_limit; addr++) {
 			if ((c = dtrace_load8(addr)) == target) {
 				regs[rd] = addr;
 
@@ -4463,13 +4463,13 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		regs[rd] = notfound;
 
 		if (!dtrace_canload((uintptr_t)addr, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!dtrace_canload((uintptr_t)substr, sublen + 1, mstate,
 		    vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4604,18 +4604,18 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		 * since both could be non-scratch addresses.
 		 */
 		if (!dtrace_strcanload(tokaddr, size, &clim, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 		toklimit = tokaddr + clim;
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
-		if (addr == NULL) {
+		if (addr == 0) {
 			/*
 			 * If the address specified is NULL, we use our saved
 			 * strtok pointer from the mstate.  Note that this
@@ -4636,7 +4636,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 			 */
 			if (!dtrace_strcanload(addr, size, &clim, mstate,
 			    vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 			limit = addr + clim;
@@ -4677,9 +4677,9 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 			 * We return NULL in this case, and we set the saved
 			 * address to NULL as well.
 			 */
-			regs[rd] = NULL;
-			mstate->dtms_strtok = NULL;
-			mstate->dtms_strtok_limit = NULL;
+			regs[rd] = 0;
+			mstate->dtms_strtok = 0;
+			mstate->dtms_strtok_limit = 0;
 			break;
 		}
 
@@ -4716,13 +4716,13 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		int64_t i;
 
 		if (!dtrace_canload(s, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4773,13 +4773,13 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 
 		if (!dtrace_canload(json, jsonlen + 1, mstate, vstate) ||
 		    !dtrace_canload(elem, elemlen + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, jsonlen + 1 + elemlen + 1)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4812,7 +4812,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		*ee++ = '\0';
 
 		if ((regs[rd] = (uintptr_t)dtrace_json(size, json, elemlist,
-		    nelems, dest)) != NULL)
+		    nelems, dest)) != 0)
 			mstate->dtms_scratch_ptr += jsonlen + 1;
 		break;
 	}
@@ -4837,13 +4837,13 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		}
 
 		if (!dtrace_canload(s, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4903,12 +4903,12 @@ case DIF_SUBR_GETMAJOR:
 		if ((mstate->dtms_access & DTRACE_ACCESS_KERNEL) == 0) {
 			*flags |= CPU_DTRACE_KPRIV;
 			*illval = daddr;
-			regs[rd] = NULL;
+			regs[rd] = 0;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4942,10 +4942,10 @@ case DIF_SUBR_GETMAJOR:
 			    d_minor) + offsetof(struct ddi_minor, dev);
 			uintptr_t scout;
 
-			if (maddr != NULL)
+			if (maddr != 0)
 				scout = dtrace_loadptr(maddr + next);
 
-			while (maddr != NULL && !(*flags & CPU_DTRACE_FAULT)) {
+			while (maddr != 0 && !(*flags & CPU_DTRACE_FAULT)) {
 				uint64_t m;
 #ifdef _LP64
 				m = dtrace_load64(maddr + dev) & MAXMIN64;
@@ -4955,17 +4955,17 @@ case DIF_SUBR_GETMAJOR:
 				if (m != minor) {
 					maddr = dtrace_loadptr(maddr + next);
 
-					if (scout == NULL)
+					if (scout == 0)
 						continue;
 
 					scout = dtrace_loadptr(scout + next);
 
-					if (scout == NULL)
+					if (scout == 0)
 						continue;
 
 					scout = dtrace_loadptr(scout + next);
 
-					if (scout == NULL)
+					if (scout == 0)
 						continue;
 
 					if (scout == maddr) {
@@ -5000,7 +5000,7 @@ case DIF_SUBR_GETMAJOR:
 			}
 		}
 
-		while (daddr != NULL && !(*flags & CPU_DTRACE_FAULT)) {
+		while (daddr != 0 && !(*flags & CPU_DTRACE_FAULT)) {
 			ddi_node_state_t devi_state;
 
 			devi_state = dtrace_load32(daddr +
@@ -5042,7 +5042,7 @@ case DIF_SUBR_GETMAJOR:
 			 * node), we're going to use the special path
 			 * "devices".
 			 */
-			if (daddr == NULL)
+			if (daddr == 0)
 				s = "devices";
 
 			len = dtrace_strlen(s, size);
@@ -5065,7 +5065,7 @@ case DIF_SUBR_GETMAJOR:
 		if (end < start)
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
 
-		if (daddr == NULL) {
+		if (daddr == 0) {
 			regs[rd] = (uintptr_t)end;
 			mstate->dtms_scratch_ptr += size;
 		}
@@ -5084,20 +5084,20 @@ case DIF_SUBR_GETMAJOR:
 
 		if (!dtrace_strcanload(s1, size, &lim1, mstate, vstate) ||
 		    !dtrace_strcanload(s2, size, &lim2, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		for (;;) {
 			if (i >= size) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 			c = (i >= lim1) ? '\0' : dtrace_load8(s1++);
@@ -5110,7 +5110,7 @@ case DIF_SUBR_GETMAJOR:
 		for (;;) {
 			if (i >= size) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -5169,7 +5169,7 @@ case DIF_SUBR_GETMAJOR:
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -5238,13 +5238,13 @@ case DIF_SUBR_GETMAJOR:
 		int start, end;
 
 		if (!dtrace_canload(src, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -5365,7 +5365,7 @@ case DIF_SUBR_GETMAJOR:
 		file_t *fp;
 
 		if (!dtrace_priv_proc(state, mstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -5391,13 +5391,13 @@ case DIF_SUBR_GETMAJOR:
 		zone_t *z;
 
 		if (!dtrace_strcanload(src, size, &lim, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -5530,7 +5530,7 @@ next:
 
 			if (!dtrace_canload(tupregs[argi].dttk_value,
 			    sizeof (ipaddr_t), mstate, vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -5545,7 +5545,7 @@ next:
 			size = INET_ADDRSTRLEN;
 			if (!DTRACE_INSCRATCH(mstate, size)) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 			base = (char *)mstate->dtms_scratch_ptr;
@@ -5589,7 +5589,7 @@ next:
 
 			if (!dtrace_canload(tupregs[argi].dttk_value,
 			    sizeof (struct in6_addr), mstate, vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -5606,7 +5606,7 @@ next:
 			size = INET6_ADDRSTRLEN;
 			if (!DTRACE_INSCRATCH(mstate, size)) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 			base = (char *)mstate->dtms_scratch_ptr;
@@ -5716,7 +5716,7 @@ next:
 			 * The user didn't use AH_INET or AH_INET6.
 			 */
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -6017,10 +6017,10 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 			uintptr_t s2 = regs[r2];
 			size_t lim1, lim2;
 
-			if (s1 != NULL &&
+			if (s1 != 0 &&
 			    !dtrace_strcanload(s1, sz, &lim1, mstate, vstate))
 				break;
-			if (s2 != NULL &&
+			if (s2 != 0 &&
 			    !dtrace_strcanload(s2, sz, &lim2, mstate, vstate))
 				break;
 
@@ -6060,7 +6060,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 					 * then this is to be treated as a
 					 * reference to a NULL variable.
 					 */
-					regs[rd] = NULL;
+					regs[rd] = 0;
 				} else {
 					regs[rd] = a + sizeof (uint64_t);
 				}
@@ -6094,7 +6094,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 				ASSERT(a != NULL);
 				ASSERT(svar->dtsv_size != 0);
 
-				if (regs[rd] == NULL) {
+				if (regs[rd] == 0) {
 					*(uint8_t *)a = UINT8_MAX;
 					break;
 				} else {
@@ -6157,7 +6157,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 					 * then this is to be treated as a
 					 * reference to a NULL variable.
 					 */
-					regs[rd] = NULL;
+					regs[rd] = 0;
 				} else {
 					regs[rd] = a + sizeof (uint64_t);
 				}
@@ -6191,7 +6191,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 				ASSERT(svar->dtsv_size == NCPU * sz);
 				a += CPU->cpu_id * sz;
 
-				if (regs[rd] == NULL) {
+				if (regs[rd] == 0) {
 					*(uint8_t *)a = UINT8_MAX;
 					break;
 				} else {
@@ -6273,7 +6273,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 			 * Given that we're storing to thread-local data,
 			 * we need to flush our predicate cache.
 			 */
-			curthread->t_predcache = NULL;
+			curthread->t_predcache = DTRACE_CACHEIDNONE;
 
 			if (dvar == NULL)
 				break;
@@ -6457,7 +6457,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 			if (size < regs[r1] ||
 			    !DTRACE_INSCRATCH(mstate, size)) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -6955,7 +6955,7 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 
 	mstate.dtms_difo = NULL;
 	mstate.dtms_probe = probe;
-	mstate.dtms_strtok = NULL;
+	mstate.dtms_strtok = 0;
 	mstate.dtms_arg[0] = arg0;
 	mstate.dtms_arg[1] = arg1;
 	mstate.dtms_arg[2] = arg2;
@@ -7651,7 +7651,7 @@ dtrace_hash_collisions(dtrace_hash_t *hash, dtrace_probe_t *template)
 			return (bucket->dthb_len);
 	}
 
-	return (NULL);
+	return (0);
 }
 
 static void
@@ -11016,7 +11016,7 @@ dtrace_ecb_action_add(dtrace_ecb_t *ecb, dtrace_actdesc_t *desc)
 			 * We know that our arg is a string -- turn it into a
 			 * format.
 			 */
-			if (arg == NULL) {
+			if (arg == 0) {
 				ASSERT(desc->dtad_kind == DTRACEACT_PRINTA ||
 				    desc->dtad_kind == DTRACEACT_DIFEXPR);
 				format = 0;
@@ -12857,7 +12857,7 @@ dtrace_dof_difo(dof_hdr_t *dof, dof_sec_t *sec, dtrace_vstate_t *vstate,
 		offsetof(dtrace_difo_t, dtdo_varlen), sizeof (dtrace_difv_t),
 		sizeof (uint_t), "multiple variable tables" },
 
-		{ DOF_SECT_NONE, 0, 0, 0, NULL }
+		{ DOF_SECT_NONE, 0, 0, 0, 0, NULL }
 	};
 
 	if (sec->dofs_type != DOF_SECT_DIFOHDR) {
@@ -14854,7 +14854,7 @@ err:
 	mstate->dtms_arg[0] = sarg0;
 	mstate->dtms_arg[1] = sarg1;
 
-	return (NULL);
+	return (0);
 }
 
 static void
@@ -16023,9 +16023,9 @@ dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, DTRACEMNR_DTRACE, S_IFCHR,
-	    DTRACEMNRN_DTRACE, DDI_PSEUDO, NULL) == DDI_FAILURE ||
+	    DTRACEMNRN_DTRACE, DDI_PSEUDO, 0) == DDI_FAILURE ||
 	    ddi_create_minor_node(devi, DTRACEMNR_HELPER, S_IFCHR,
-	    DTRACEMNRN_HELPER, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    DTRACEMNRN_HELPER, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		cmn_err(CE_NOTE, "/dev/dtrace couldn't create minor nodes");
 		ddi_remove_minor_node(devi, NULL);
 		ddi_soft_state_fini(&dtrace_softstate);
@@ -16583,7 +16583,7 @@ dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 		 * If a NULL argument has been passed, we take this as our
 		 * cue to reevaluate our enablings.
 		 */
-		if (arg == NULL) {
+		if (arg == 0) {
 			dtrace_enabling_matchall();
 
 			return (0);
diff --git a/usr/src/uts/common/dtrace/fasttrap.c b/usr/src/uts/common/dtrace/fasttrap.c
index 3948dd258e..6a3079a474 100644
--- a/usr/src/uts/common/dtrace/fasttrap.c
+++ b/usr/src/uts/common/dtrace/fasttrap.c
@@ -121,7 +121,7 @@
  * creation lock.
  *
  * Briefly:
- * 	bucket lock before provider lock
+ *	bucket lock before provider lock
  *	DTrace before provider lock
  *	creation lock before DTrace
  *	never hold the provider lock and creation lock simultaneously
@@ -2134,7 +2134,7 @@ fasttrap_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "fasttrap", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    DDI_PSEUDO, 0) == DDI_FAILURE) {
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);
 	}
diff --git a/usr/src/uts/common/dtrace/systrace.c b/usr/src/uts/common/dtrace/systrace.c
index 3d36ce9547..5f508915b1 100644
--- a/usr/src/uts/common/dtrace/systrace.c
+++ b/usr/src/uts/common/dtrace/systrace.c
@@ -245,7 +245,7 @@ systrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	membar_enter();
 
 	if (ddi_create_minor_node(devi, "systrace", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE ||
+	    DDI_PSEUDO, 0) == DDI_FAILURE ||
 	    dtrace_register("syscall", &systrace_attr, DTRACE_PRIV_USER, NULL,
 	    &systrace_pops, NULL, &systrace_id) != 0) {
 		systrace_probe = systrace_stub;
diff --git a/usr/src/uts/common/fs/zfs/vdev_label.c b/usr/src/uts/common/fs/zfs/vdev_label.c
index 17553607a5..847cfe3f65 100644
--- a/usr/src/uts/common/fs/zfs/vdev_label.c
+++ b/usr/src/uts/common/fs/zfs/vdev_label.c
@@ -184,8 +184,9 @@ static void
 vdev_label_read(zio_t *zio, vdev_t *vd, int l, abd_t *buf, uint64_t offset,
     uint64_t size, zio_done_func_t *done, void *private, int flags)
 {
-	ASSERT(spa_config_held(zio->io_spa, SCL_STATE_ALL, RW_WRITER) ==
-	    SCL_STATE_ALL);
+	ASSERT(
+	    spa_config_held(zio->io_spa, SCL_STATE, RW_READER) == SCL_STATE ||
+	    spa_config_held(zio->io_spa, SCL_STATE, RW_WRITER) == SCL_STATE);
 	ASSERT(flags & ZIO_FLAG_CONFIG_WRITER);
 
 	zio_nowait(zio_read_phys(zio, vd,
@@ -198,17 +199,9 @@ void
 vdev_label_write(zio_t *zio, vdev_t *vd, int l, abd_t *buf, uint64_t offset,
     uint64_t size, zio_done_func_t *done, void *private, int flags)
 {
-#ifdef _KERNEL
-	/*
-	 * This assert is invalid in the user-level ztest MMP code because
-	 * the ztest thread is not in dsl_pool_sync_context. ZoL does not
-	 * build the user-level code with DEBUG so this is not an issue there.
-	 */
-	ASSERT(spa_config_held(zio->io_spa, SCL_ALL, RW_WRITER) == SCL_ALL ||
-	    (spa_config_held(zio->io_spa, SCL_CONFIG | SCL_STATE, RW_READER) ==
-	    (SCL_CONFIG | SCL_STATE) &&
-	    dsl_pool_sync_context(spa_get_dsl(zio->io_spa))));
-#endif
+	ASSERT(
+	    spa_config_held(zio->io_spa, SCL_STATE, RW_READER) == SCL_STATE ||
+	    spa_config_held(zio->io_spa, SCL_STATE, RW_WRITER) == SCL_STATE);
 	ASSERT(flags & ZIO_FLAG_CONFIG_WRITER);
 
 	zio_nowait(zio_write_phys(zio, vd,
diff --git a/usr/src/uts/common/inet/ip/spdsock.c b/usr/src/uts/common/inet/ip/spdsock.c
index 5911b45770..1ae2279dcf 100644
--- a/usr/src/uts/common/inet/ip/spdsock.c
+++ b/usr/src/uts/common/inet/ip/spdsock.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright 2019, Joyent, Inc.
  */
 
 #include <sys/param.h>
@@ -3609,7 +3609,7 @@ spdsock_wsrv(queue_t *q)
 
 	while ((mp = getq(q)) != NULL) {
 		if (ipsec_loaded(ipss)) {
-			spdsock_wput(q, mp);
+			(void) spdsock_wput(q, mp);
 			if (ss->spdsock_dump_req != NULL)
 				return (0);
 		} else if (!ipsec_failed(ipss)) {
diff --git a/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h b/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h
index e5ef739a87..17faa17087 100644
--- a/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h
+++ b/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h
@@ -23,6 +23,10 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef _SRPT_IMPL_H_
 #define	_SRPT_IMPL_H_
 
@@ -92,7 +96,7 @@ struct srpt_target_port_s;
  * by a login.
  */
 typedef struct srpt_session_s {
-	krwlock_t 			ss_rwlock;
+	krwlock_t			ss_rwlock;
 	list_node_t			ss_node;
 
 	/*
@@ -167,7 +171,7 @@ typedef enum srpt_channel_state_e {
 } srpt_channel_state_t;
 
 typedef struct srpt_channel_s {
-	krwlock_t 			ch_rwlock;
+	krwlock_t			ch_rwlock;
 
 	kmutex_t			ch_reflock;
 	uint_t				ch_refcnt;
@@ -322,7 +326,7 @@ typedef struct srpt_target_port_s {
 typedef struct srpt_ioc_s {
 	list_node_t			ioc_node;
 
-	krwlock_t 			ioc_rwlock;
+	krwlock_t			ioc_rwlock;
 	ibt_hca_hdl_t			ioc_ibt_hdl;
 	ibt_hca_attr_t			ioc_attr;
 	ib_guid_t			ioc_guid;
@@ -518,8 +522,8 @@ extern uint_t srpt_errlevel;
 					cmn_err(CE_NOTE, __VA_ARGS__);\
 				}
 #else
-#define	SRPT_DPRINTF_L3		0 &&
-#define	SRPT_DPRINTF_L4		0 &&
+#define	SRPT_DPRINTF_L3(...)
+#define	SRPT_DPRINTF_L4(...)
 #endif
 
 #ifdef __cplusplus
diff --git a/usr/src/uts/common/io/pciex/pcieb.h b/usr/src/uts/common/io/pciex/pcieb.h
index 635ed7c784..fdb66a7844 100644
--- a/usr/src/uts/common/io/pciex/pcieb.h
+++ b/usr/src/uts/common/io/pciex/pcieb.h
@@ -22,6 +22,10 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef _SYS_PCIEB_H
 #define	_SYS_PCIEB_H
 
@@ -33,7 +37,7 @@ extern "C" {
 #define	PCIEB_DEBUG pcieb_dbg
 extern void pcieb_dbg(uint_t bit, dev_info_t *dip, char *fmt, ...);
 #else /* DEBUG */
-#define	PCIEB_DEBUG 0 &&
+#define	PCIEB_DEBUG(...)
 #endif /* DEBUG */
 
 typedef enum {	/* same sequence as pcieb_debug_sym[] */
@@ -160,12 +164,12 @@ extern void *pcieb_state;
 extern void	pcieb_set_pci_perf_parameters(dev_info_t *dip,
 		    ddi_acc_handle_t config_handle);
 extern void	pcieb_plat_attach_workaround(dev_info_t *dip);
-extern void 	pcieb_plat_intr_attach(pcieb_devstate_t *pcieb);
-extern void 	pcieb_plat_initchild(dev_info_t *child);
-extern void 	pcieb_plat_uninitchild(dev_info_t *child);
+extern void	pcieb_plat_intr_attach(pcieb_devstate_t *pcieb);
+extern void	pcieb_plat_initchild(dev_info_t *child);
+extern void	pcieb_plat_uninitchild(dev_info_t *child);
 extern int	pcieb_plat_ctlops(dev_info_t *rdip, ddi_ctl_enum_t ctlop,
     void *arg);
-extern int 	pcieb_plat_pcishpc_probe(dev_info_t *dip,
+extern int	pcieb_plat_pcishpc_probe(dev_info_t *dip,
     ddi_acc_handle_t config_handle);
 extern int	pcieb_plat_peekpoke(dev_info_t *dip, dev_info_t *rdip,
     ddi_ctl_enum_t ctlop, void *arg, void *result);
diff --git a/usr/src/uts/common/io/ppp/sppp/sppp.c b/usr/src/uts/common/io/ppp/sppp/sppp.c
index 4cf02abe2e..1d9e9fed70 100644
--- a/usr/src/uts/common/io/ppp/sppp/sppp.c
+++ b/usr/src/uts/common/io/ppp/sppp/sppp.c
@@ -4,6 +4,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright 2019, Joyent, Inc.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation is hereby granted, provided that the above copyright
@@ -1842,7 +1843,7 @@ sppp_lrsrv(queue_t *q)
 	mblk_t *mp;
 
 	while ((mp = getq(q)) != NULL)
-		sppp_lrput(q, mp);
+		(void) sppp_lrput(q, mp);
 	return (0);
 }
 
diff --git a/usr/src/uts/common/io/softmac/softmac_dev.c b/usr/src/uts/common/io/softmac/softmac_dev.c
index 3b9c76a7e2..60415e3422 100644
--- a/usr/src/uts/common/io/softmac/softmac_dev.c
+++ b/usr/src/uts/common/io/softmac/softmac_dev.c
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
 
 #include <sys/types.h>
 #include <inet/common.h>
@@ -662,7 +665,7 @@ softmac_drv_wsrv(queue_t *wq)
 		 */
 		sup->su_tx_inprocess++;
 		mutex_exit(&sup->su_mutex);
-		dld_wsrv(wq);
+		(void) dld_wsrv(wq);
 		mutex_enter(&sup->su_mutex);
 		if (--sup->su_tx_inprocess == 0)
 			cv_signal(&sup->su_cv);
diff --git a/usr/src/uts/common/io/softmac/softmac_fp.c b/usr/src/uts/common/io/softmac/softmac_fp.c
index 8286ac4013..174a7b2e86 100644
--- a/usr/src/uts/common/io/softmac/softmac_fp.c
+++ b/usr/src/uts/common/io/softmac/softmac_fp.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright 2019, Joyent, Inc.
+ */
+
+/*
  * Softmac data-path switching:
  *
  * - Fast-path model
@@ -764,7 +768,7 @@ softmac_wput_single_nondata(softmac_upper_t *sup, mblk_t *mp)
 	 * operation is is serialized by softmac_wput_nondata_task().
 	 */
 	if (sup->su_mode != SOFTMAC_FASTPATH) {
-		dld_wput(sup->su_wq, mp);
+		(void) dld_wput(sup->su_wq, mp);
 		return;
 	}
 
@@ -986,7 +990,7 @@ softmac_wput_data(softmac_upper_t *sup, mblk_t *mp)
 	 * process of switching.
 	 */
 	if (sup->su_mode != SOFTMAC_FASTPATH)
-		dld_wput(sup->su_wq, mp);
+		(void) dld_wput(sup->su_wq, mp);
 	else
 		(void) softmac_fastpath_wput_data(sup, mp, (uintptr_t)NULL, 0);
 }
diff --git a/usr/src/uts/common/sys/ib/clients/eoib/eib_impl.h b/usr/src/uts/common/sys/ib/clients/eoib/eib_impl.h
index 546bd51839..98788661ca 100644
--- a/usr/src/uts/common/sys/ib/clients/eoib/eib_impl.h
+++ b/usr/src/uts/common/sys/ib/clients/eoib/eib_impl.h
@@ -23,6 +23,10 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef _SYS_IB_EOIB_EIB_IMPL_H
 #define	_SYS_IB_EOIB_EIB_IMPL_H
 
@@ -88,10 +92,10 @@ extern "C" {
 #define	EIB_DPRINTF_PKT		eib_dprintf_pkt
 #define	EIB_DPRINTF_VERBOSE	eib_dprintf_verbose
 #else
-#define	EIB_DPRINTF_DEBUG	0 &&
-#define	EIB_DPRINTF_ARGS	0 &&
-#define	EIB_DPRINTF_PKT		0 &&
-#define	EIB_DPRINTF_VERBOSE	0 &&
+#define	EIB_DPRINTF_DEBUG(...)
+#define	EIB_DPRINTF_ARGS(...)
+#define	EIB_DPRINTF_PKT(...)
+#define	EIB_DPRINTF_VERBOSE(...)
 #endif
 
 /*
diff --git a/usr/src/uts/common/sys/ib/clients/eoib/enx_impl.h b/usr/src/uts/common/sys/ib/clients/eoib/enx_impl.h
index 2f36734a0b..9e5b3486b2 100644
--- a/usr/src/uts/common/sys/ib/clients/eoib/enx_impl.h
+++ b/usr/src/uts/common/sys/ib/clients/eoib/enx_impl.h
@@ -23,6 +23,10 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef _SYS_IB_EOIB_ENX_IMPL_H
 #define	_SYS_IB_EOIB_ENX_IMPL_H
 
@@ -71,9 +75,9 @@ extern "C" {
 #define	ENX_DPRINTF_ARGS	eibnx_dprintf_args
 #define	ENX_DPRINTF_VERBOSE	eibnx_dprintf_verbose
 #else
-#define	ENX_DPRINTF_DEBUG	0 &&
-#define	ENX_DPRINTF_ARGS	0 &&
-#define	ENX_DPRINTF_VERBOSE	0 &&
+#define	ENX_DPRINTF_DEBUG(...)
+#define	ENX_DPRINTF_ARGS(...)
+#define	ENX_DPRINTF_VERBOSE(...)
 #endif
 
 /*
@@ -93,7 +97,7 @@ extern "C" {
  * Portinfo list per HCA
  */
 typedef struct eibnx_port_s {
-	struct eibnx_port_s 	*po_next;
+	struct eibnx_port_s	*po_next;
 	ibt_hca_portinfo_t	*po_pi;
 	uint_t			po_pi_size;
 } eibnx_port_t;
@@ -102,7 +106,7 @@ typedef struct eibnx_port_s {
  * HCA details
  */
 typedef struct eibnx_hca_s {
-	struct eibnx_hca_s 	*hc_next;
+	struct eibnx_hca_s	*hc_next;
 	ib_guid_t		hc_guid;
 	ibt_hca_hdl_t		hc_hdl;
 	ibt_pd_hdl_t		hc_pd;
diff --git a/usr/src/uts/common/sys/ib/clients/rds/rdsib_debug.h b/usr/src/uts/common/sys/ib/clients/rds/rdsib_debug.h
index efa28a0251..b6208fbf59 100644
--- a/usr/src/uts/common/sys/ib/clients/rds/rdsib_debug.h
+++ b/usr/src/uts/common/sys/ib/clients/rds/rdsib_debug.h
@@ -23,11 +23,13 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef _RDSIB_DEBUG_H
 #define	_RDSIB_DEBUG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -99,10 +101,10 @@ void rds_dprintf3(
 		char		*name,
 		char		*fmt, ...);
 #else
-#define	RDS_DPRINTF_INTR	0 &&
-#define	RDS_DPRINTF5		0 &&
-#define	RDS_DPRINTF4		0 &&
-#define	RDS_DPRINTF3		0 &&
+#define	RDS_DPRINTF_INTR(...)
+#define	RDS_DPRINTF5(...)
+#define	RDS_DPRINTF4(...)
+#define	RDS_DPRINTF3(...)
 #endif
 
 #define	RDS_DPRINTF2	rds_dprintf2
diff --git a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_debug.h b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_debug.h
index 010d4375a2..272050476e 100644
--- a/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_debug.h
+++ b/usr/src/uts/common/sys/ib/clients/rdsv3/rdsv3_debug.h
@@ -22,6 +22,10 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef _RDSV3_DEBUG_H
 #define	_RDSV3_DEBUG_H
 
@@ -96,10 +100,10 @@ void rdsv3_dprintf3(
 		char		*name,
 		char		*fmt, ...);
 #else
-#define	RDSV3_DPRINTF_INTR	0 &&
-#define	RDSV3_DPRINTF5		0 &&
-#define	RDSV3_DPRINTF4		0 &&
-#define	RDSV3_DPRINTF3		0 &&
+#define	RDSV3_DPRINTF_INTR(...)
+#define	RDSV3_DPRINTF5(...)
+#define	RDSV3_DPRINTF4(...)
+#define	RDSV3_DPRINTF3(...)
 #endif
 
 #define	RDSV3_DPRINTF2		rdsv3_dprintf2
diff --git a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_util.h b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_util.h
index b77d23ea49..c7a5d1d088 100644
--- a/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_util.h
+++ b/usr/src/uts/common/sys/ib/ibtl/impl/ibtl_util.h
@@ -24,11 +24,13 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef	_SYS_IB_IBTL_IMPL_IBTL_UTIL_H
 #define	_SYS_IB_IBTL_IMPL_IBTL_UTIL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ibtl_util.h
  *
@@ -131,10 +133,10 @@ void ibtl_dprintf3(
 		char		*name,
 		char		*fmt, ...);
 #else
-#define	IBTF_DPRINTF_LINTR	0 &&
-#define	IBTF_DPRINTF_L5		0 &&
-#define	IBTF_DPRINTF_L4		0 &&
-#define	IBTF_DPRINTF_L3		0 &&
+#define	IBTF_DPRINTF_LINTR(...)
+#define	IBTF_DPRINTF_L5(...)
+#define	IBTF_DPRINTF_L4(...)
+#define	IBTF_DPRINTF_L3(...)
 #endif
 
 #define	IBTF_DPRINTF_L2	ibtl_dprintf2
diff --git a/usr/src/uts/common/sys/pcie_impl.h b/usr/src/uts/common/sys/pcie_impl.h
index 0e37a515eb..6fa459b7d0 100644
--- a/usr/src/uts/common/sys/pcie_impl.h
+++ b/usr/src/uts/common/sys/pcie_impl.h
@@ -23,6 +23,10 @@
  * Copyright (c) 2017, Joyent, Inc.
  */
 
+/*
+ * Copyright 2019, Joyent, Inc.
+ */
+
 #ifndef	_SYS_PCIE_IMPL_H
 #define	_SYS_PCIE_IMPL_H
 
@@ -524,11 +528,11 @@ typedef struct {
 
 #else	/* DEBUG */
 
-#define	PCIE_DBG_CFG 0 &&
-#define	PCIE_DBG 0 &&
-#define	PCIE_ARI_DBG 0 &&
-#define	PCIE_DBG_CAP 0 &&
-#define	PCIE_DBG_AER 0 &&
+#define	PCIE_DBG_CFG(...)
+#define	PCIE_DBG(...)
+#define	PCIE_ARI_DBG(...)
+#define	PCIE_DBG_CAP(...)
+#define	PCIE_DBG_AER(...)
 
 #endif	/* DEBUG */
 
diff --git a/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h b/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h
index e6d6ac1342..c4abe6f9aa 100644
--- a/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h
+++ b/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h
@@ -21,7 +21,7 @@
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright 2016 Joyent, Inc.
+ * Copyright 2019, Joyent, Inc.
  */
 
 #ifndef _SYS_USB_SCSA2USB_H
@@ -183,7 +183,7 @@ extern "C" {
  * SCSA2USB_ATTRS_NO_MEDIA_CHECK: AMI Virtual Floppy devices need to
  *		check if media is ready before issuing READ CAPACITY.
  * SCSA2USB_ATTRS_NO_CAP_ADJUST: Some devices return total logical block number
- * 		instead of highest logical block address on READ_CAPACITY cmd.
+ *		instead of highest logical block address on READ_CAPACITY cmd.
  *
  * NOTE: If a device simply STALLs the GET_MAX_LUN BO class-specific command
  * and recovers then it will not be added to the scsa2usb_blacklist[] table
@@ -280,7 +280,7 @@ typedef struct scsa2usb_ov {
 typedef struct scsa2usb_state {
 	int			scsa2usb_instance;	/* Instance number    */
 	int			scsa2usb_dev_state;	/* USB device state   */
-	int			scsa2usb_flags; 	/* Per instance flags */
+	int			scsa2usb_flags;		/* Per instance flags */
 	int			scsa2usb_intfc_num;	/* Interface number   */
 	dev_info_t		*scsa2usb_dip;		/* Per device. info   */
 	scsa2usb_power_t	*scsa2usb_pm;		/* PM state info */
@@ -539,7 +539,7 @@ typedef struct scsa2usb_cmd {
 	int			cmd_timeout;		/* copy of pkt_time */
 	uchar_t			cmd_cdb[SCSI_CDB_SIZE];	/* CDB */
 	uchar_t			cmd_dir;		/* direction */
-	uchar_t			cmd_actual_len; 	/* cdb len */
+	uchar_t			cmd_actual_len;		/* cdb len */
 	uchar_t			cmd_cdblen;		/* requested  cdb len */
 	struct scsi_arq_status	cmd_scb;		/* status, w/ arq */
 
@@ -655,7 +655,7 @@ typedef struct scsa2usb_read_cap {
 #ifdef	DEBUG
 #define	SCSA2USB_PRINT_CDB	scsa2usb_print_cdb
 #else
-#define	SCSA2USB_PRINT_CDB	0 &&
+#define	SCSA2USB_PRINT_CDB(...)
 #endif
 
 /* ugen support */
diff --git a/usr/src/uts/intel/dtrace/dtrace_isa.c b/usr/src/uts/intel/dtrace/dtrace_isa.c
index f52180b0c0..ee87d5feb9 100644
--- a/usr/src/uts/intel/dtrace/dtrace_isa.c
+++ b/usr/src/uts/intel/dtrace/dtrace_isa.c
@@ -85,7 +85,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 		}
 
 		if (aframes > 0) {
-			if (--aframes == 0 && caller != NULL) {
+			if (--aframes == 0 && caller != 0) {
 				/*
 				 * We've just run out of artificial frames,
 				 * and we have a valid caller -- fill it in
@@ -93,7 +93,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 				 */
 				ASSERT(depth < pcstack_limit);
 				pcstack[depth++] = (pc_t)caller;
-				caller = NULL;
+				caller = 0;
 			}
 		} else {
 			if (depth < pcstack_limit)
@@ -102,7 +102,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 
 		if (last) {
 			while (depth < pcstack_limit)
-				pcstack[depth++] = NULL;
+				pcstack[depth++] = 0;
 			return;
 		}
 
@@ -263,7 +263,7 @@ dtrace_getupcstack(uint64_t *pcstack, int pcstack_limit)
 
 zero:
 	while (pcstack_limit-- > 0)
-		*pcstack++ = NULL;
+		*pcstack++ = 0;
 }
 
 int
@@ -407,7 +407,7 @@ dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit)
 
 zero:
 	while (pcstack_limit-- > 0)
-		*pcstack++ = NULL;
+		*pcstack++ = 0;
 }
 
 /*ARGSUSED*/
diff --git a/usr/src/uts/intel/dtrace/fbt.c b/usr/src/uts/intel/dtrace/fbt.c
index b9353bd30c..5df2d8b803 100644
--- a/usr/src/uts/intel/dtrace/fbt.c
+++ b/usr/src/uts/intel/dtrace/fbt.c
@@ -117,7 +117,7 @@ fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval)
 				dtrace_probe(fbt->fbtp_id, stack0, stack1,
 				    stack2, stack3, stack4);
 
-				CPU->cpu_dtrace_caller = NULL;
+				CPU->cpu_dtrace_caller = 0;
 			} else {
 #ifdef __amd64
 				/*
@@ -134,7 +134,7 @@ fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval)
 
 				dtrace_probe(fbt->fbtp_id, fbt->fbtp_roffset,
 				    rval, 0, 0, 0);
-				CPU->cpu_dtrace_caller = NULL;
+				CPU->cpu_dtrace_caller = 0;
 			}
 
 			return (fbt->fbtp_rval);
@@ -183,7 +183,7 @@ fbt_provide_module(void *arg, struct modctl *ctl)
 	if (strcmp(modname, "kmdbmod") == 0)
 		return;
 
-	if (str == NULL || symhdr == NULL || symhdr->sh_addr == NULL) {
+	if (str == NULL || symhdr == NULL || symhdr->sh_addr == 0) {
 		/*
 		 * If this module doesn't (yet) have its string or symbol
 		 * table allocated, clear out.
@@ -264,7 +264,7 @@ fbt_provide_module(void *arg, struct modctl *ctl)
 		 * In order to be eligible, the function must begin with the
 		 * following sequence:
 		 *
-		 * 	pushl	%esp
+		 *	pushl	%esp
 		 *	movl	%esp, %ebp
 		 *
 		 * Note that there are two variants of encodings that generate
@@ -721,7 +721,7 @@ fbt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	dtrace_invop_add(fbt_invop);
 
 	if (ddi_create_minor_node(devi, "fbt", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE ||
+	    DDI_PSEUDO, 0) == DDI_FAILURE ||
 	    dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_KERNEL, NULL,
 	    &fbt_pops, NULL, &fbt_id) != 0) {
 		fbt_cleanup(devi);
diff --git a/usr/src/uts/intel/dtrace/sdt.c b/usr/src/uts/intel/dtrace/sdt.c
index e98f6a30c0..3c84aeed5c 100644
--- a/usr/src/uts/intel/dtrace/sdt.c
+++ b/usr/src/uts/intel/dtrace/sdt.c
@@ -406,7 +406,7 @@ sdt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	sdt_provider_t *prov;
 
 	if (ddi_create_minor_node(devi, "sdt", S_IFCHR,
-	    0, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    0, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		cmn_err(CE_NOTE, "/dev/sdt couldn't create minor node");
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);