10306 mdb: NULL pointer errors

Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

105 files changed, 809 insertions, 874 deletions

diff --git a/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c b/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c
index f581d1dbad..1b75f21911 100644
--- a/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c
+++ b/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c
@@ -1155,7 +1155,7 @@ kmt_mapping_iter(mdb_tgt_t *t, mdb_tgt_map_f *func, void *private)
 	m.map_cb = func;
 	m.map_data = private;
 
-	if ((kas = kmt_read_kas(t)) == NULL)
+	if ((kas = kmt_read_kas(t)) == 0)
 		return (-1); /* errno is set for us */
 
 	return (mdb_pwalk("seg", (mdb_walk_cb_t)kmt_mapping_walk, &m, kas));
@@ -1696,7 +1696,7 @@ static char *
 kmt_brkpt_info(mdb_tgt_t *t, mdb_sespec_t *sep, mdb_vespec_t *vep,
     mdb_tgt_spec_desc_t *sp, char *buf, size_t nbytes)
 {
-	uintptr_t addr = NULL;
+	uintptr_t addr = 0;
 
 	if (vep != NULL) {
 		kmt_bparg_t *ka = vep->ve_args;
@@ -2227,7 +2227,7 @@ kmt_add_sbrkpt(mdb_tgt_t *t, const char *fullname,
 
 	ka = mdb_alloc(sizeof (kmt_bparg_t), UM_SLEEP);
 	ka->ka_symbol = strdup(fullname);
-	ka->ka_addr = NULL;
+	ka->ka_addr = 0;
 	ka->ka_defbp = dbp;
 
 	return (mdb_tgt_vespec_insert(t, &kmt_brkpt_ops, spec_flags,
diff --git a/usr/src/cmd/mdb/common/kmdb/kmdb_promif.c b/usr/src/cmd/mdb/common/kmdb/kmdb_promif.c
index 81ac1eacfc..637e685b06 100644
--- a/usr/src/cmd/mdb/common/kmdb/kmdb_promif.c
+++ b/usr/src/cmd/mdb/common/kmdb/kmdb_promif.c
@@ -72,7 +72,7 @@ kmdb_prom_getchar(int wait)
 	getchar = (uintptr_t)pio->cons_polledio_getchar;
 	arg = (uintptr_t)pio->cons_polledio_argument;
 
-	if (!wait && ischar != NULL && !kmdb_dpi_call(ischar, 1, &arg))
+	if (!wait && ischar != 0 && !kmdb_dpi_call(ischar, 1, &arg))
 		return (-1);
 
 	return ((int)kmdb_dpi_call(getchar, 1, &arg));
diff --git a/usr/src/cmd/mdb/common/libstand/getopt.c b/usr/src/cmd/mdb/common/libstand/getopt.c
index 286c26e5d7..cdc1cd6ffe 100644
--- a/usr/src/cmd/mdb/common/libstand/getopt.c
+++ b/usr/src/cmd/mdb/common/libstand/getopt.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/salib.h>
 
 #define	EOF	(-1)
@@ -56,7 +54,7 @@ getopt(int argc, char *const *argv, const char *opts)
 		if (optind >= argc || argv[optind][0] != '-' ||
 		    argv[optind] == NULL || argv[optind][1] == '\0')
 			return (EOF);
-		else if (strcmp(argv[optind], "--") == NULL) {
+		else if (strcmp(argv[optind], "--") == 0) {
 			optind++;
 			return (EOF);
 		}
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c
index a543aafb09..dd3f9cd11e 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c
@@ -2789,7 +2789,7 @@ cmd_run(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			mdb_warn("failed to create new target");
 		return (DCMD_ERR);
 	}
-	return (cmd_cont(NULL, 0, 0, NULL));
+	return (cmd_cont(0, 0, 0, NULL));
 }
 #endif
 
@@ -2809,7 +2809,7 @@ ve_delete(mdb_tgt_t *t, mdb_tgt_spec_desc_t *sp, int vid, void *data)
 	if (vid < 0)
 		return (0); /* skip over target implementation events */
 
-	if (sp->spec_base != NULL) {
+	if (sp->spec_base != 0) {
 		(void) mdb_tgt_vespec_info(t, vid, &spec, NULL, 0);
 		if (sp->spec_base - spec.spec_base < spec.spec_size)
 			status = mdb_tgt_vespec_delete(t, vid);
@@ -2836,7 +2836,7 @@ ve_delete_spec(mdb_tgt_spec_desc_t *sp)
 	    (mdb_tgt_vespec_f *)ve_delete, sp);
 
 	if (sp->spec_size == 0) {
-		if (sp->spec_id != 0 || sp->spec_base != NULL)
+		if (sp->spec_id != 0 || sp->spec_base != 0)
 			mdb_warn("no traced events matched description\n");
 	}
 
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_kvm.c b/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
index 8e96c04350..0c2b6efbed 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
@@ -140,7 +140,7 @@ kt_load_modules(kt_data_t *kt, mdb_tgt_t *t)
 	addr = head = (uintptr_t)sym.st_value;
 
 	do {
-		if (addr == NULL)
+		if (addr == 0)
 			break; /* Avoid spurious NULL pointers in list */
 
 		if (mdb_tgt_vread(t, &ctl, sizeof (ctl), addr) == -1) {
@@ -1190,7 +1190,7 @@ kt_load_ctfdata(mdb_tgt_t *t, kt_module_t *km)
 	if (km->km_ctfp != NULL)
 		return (km->km_ctfp);
 
-	if (km->km_ctf_va == NULL) {
+	if (km->km_ctf_va == 0) {
 		(void) set_errno(EMDB_NOCTF);
 		return (NULL);
 	}
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_modapi.c b/usr/src/cmd/mdb/common/mdb/mdb_modapi.c
index b803095843..c944a03729 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_modapi.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_modapi.c
@@ -578,7 +578,7 @@ mdb_pwalk(const char *name, mdb_walk_cb_t func, void *private, uintptr_t addr)
 int
 mdb_walk(const char *name, mdb_walk_cb_t func, void *data)
 {
-	return (mdb_pwalk(name, func, data, NULL));
+	return (mdb_pwalk(name, func, data, 0));
 }
 
 /*ARGSUSED*/
@@ -638,7 +638,7 @@ int
 mdb_walk_dcmd(const char *wname, const char *dcname,
     int argc, const mdb_arg_t *argv)
 {
-	return (mdb_pwalk_dcmd(wname, dcname, argc, argv, NULL));
+	return (mdb_pwalk_dcmd(wname, dcname, argc, argv, 0));
 }
 
 /*ARGSUSED*/
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_print.c b/usr/src/cmd/mdb/common/mdb/mdb_print.c
index 3a083d4ac0..b39c7e87fe 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_print.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_print.c
@@ -783,7 +783,7 @@ cmd_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		}
 
 		a = tmp;
-	} while (a != addr && a != NULL);
+	} while (a != addr && a != 0);
 
 	return (DCMD_OK);
 }
@@ -1143,7 +1143,7 @@ print_ptr(const char *type, const char *name, mdb_ctf_id_t id,
 
 	mdb_printf("%a", value);
 
-	if (value == NULL || strcmp(type, "caddr_t") == 0)
+	if (value == 0 || strcmp(type, "caddr_t") == 0)
 		return (0);
 
 	if (mdb_ctf_type_kind(base) == CTF_K_POINTER &&
@@ -2365,7 +2365,7 @@ cmd_print(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	if ((flags & DCMD_ADDRSPEC) && !opt_i)
 		pa.pa_addr = opt_p ? mdb_get_dot() : addr;
 	else
-		pa.pa_addr = NULL;
+		pa.pa_addr = 0;
 
 	if (opt_i) {
 		const char *vargv[2];
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_proc.c b/usr/src/cmd/mdb/common/mdb/mdb_proc.c
index 48f241b222..2fd564d122 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_proc.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_proc.c
@@ -3170,7 +3170,7 @@ pt_object_iter(mdb_tgt_t *t, mdb_tgt_map_f *func, void *private)
 		(void) strncpy(mp->map_name, s, MDB_TGT_MAPSZ);
 		mp->map_name[MDB_TGT_MAPSZ - 1] = '\0';
 		mp->map_flags = MDB_TGT_MAP_R | MDB_TGT_MAP_X;
-		mp->map_base = NULL;
+		mp->map_base = 0;
 		mp->map_size = 0;
 
 		if (func(private, mp, s) != 0)
@@ -3983,7 +3983,7 @@ pt_brkpt_ctor(mdb_tgt_t *t, mdb_sespec_t *sep, void *args)
 
 	ptb = mdb_alloc(sizeof (pt_brkpt_t), UM_SLEEP);
 	ptb->ptb_addr = pta->pta_addr;
-	ptb->ptb_instr = NULL;
+	ptb->ptb_instr = 0;
 	sep->se_data = ptb;
 
 	return (0);
@@ -4001,7 +4001,7 @@ static char *
 pt_brkpt_info(mdb_tgt_t *t, mdb_sespec_t *sep, mdb_vespec_t *vep,
     mdb_tgt_spec_desc_t *sp, char *buf, size_t nbytes)
 {
-	uintptr_t addr = NULL;
+	uintptr_t addr = 0;
 
 	if (vep != NULL) {
 		pt_bparg_t *pta = vep->ve_args;
@@ -4385,7 +4385,7 @@ pt_add_sbrkpt(mdb_tgt_t *t, const char *sym,
 
 	pta = mdb_alloc(sizeof (pt_bparg_t), UM_SLEEP);
 	pta->pta_symbol = strdup(sym);
-	pta->pta_addr = NULL;
+	pta->pta_addr = 0;
 
 	return (mdb_tgt_vespec_insert(t, &proc_brkpt_ops, spec_flags,
 	    func, data, pta, pt_bparg_dtor));
@@ -5098,7 +5098,7 @@ pt_xd_auxv(mdb_tgt_t *t, void *buf, size_t nbytes)
 
 	if (P != NULL && (auxv = Pgetauxvec(P)) != NULL &&
 	    auxv->a_type != AT_NULL) {
-		for (auxp = auxv, auxn = 1; auxp->a_type != NULL; auxp++)
+		for (auxp = auxv, auxn = 1; auxp->a_type != 0; auxp++)
 			auxn++;
 	}
 
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_target.c b/usr/src/cmd/mdb/common/mdb/mdb_target.c
index edeac638e9..17aef0aac1 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_target.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_target.c
@@ -1449,7 +1449,7 @@ mdb_tgt_vespec_info(mdb_tgt_t *t, int vid, mdb_tgt_spec_desc_t *sp,
 	sp->spec_limit = vep->ve_limit;
 	sp->spec_state = sep->se_state;
 	sp->spec_errno = sep->se_errno;
-	sp->spec_base = NULL;
+	sp->spec_base = 0;
 	sp->spec_size = 0;
 	sp->spec_data = vep->ve_data;
 
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_termio.c b/usr/src/cmd/mdb/common/mdb/mdb_termio.c
index 9d033f84a5..825b7b38ec 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_termio.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_termio.c
@@ -369,7 +369,7 @@ static const termio_attr_t termio_attrs[] = {
 	{ "nel", TIO_ATTR_STR, &termio_info.ti_nel },
 	{ "cr", TIO_ATTR_STR, &termio_info.ti_cr },
 	{ "smam", TIO_ATTR_STR, &termio_info.ti_smam },
-	{ NULL, NULL, NULL }
+	{ NULL, 0, NULL }
 };
 
 /*
diff --git a/usr/src/cmd/mdb/common/modules/cpc/cpc.c b/usr/src/cmd/mdb/common/modules/cpc/cpc.c
index 657b4adfe9..7efcd244e6 100644
--- a/usr/src/cmd/mdb/common/modules/cpc/cpc.c
+++ b/usr/src/cmd/mdb/common/modules/cpc/cpc.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/mdb_modapi.h>
 #include <sys/kcpc.h>
 #include <sys/cpc_impl.h>
@@ -156,7 +154,7 @@ cpc_ctx_walk_init(mdb_walk_state_t *wsp)
 {
 	struct cpc_ctx_aux *cca;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("only global cpc_ctx walk supported\n");
 		return (WALK_ERR);
 	}
@@ -171,7 +169,7 @@ cpc_ctx_walk_init(mdb_walk_state_t *wsp)
 	}
 
 	wsp->walk_data = cca;
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = 0;
 	return (WALK_NEXT);
 }
 
@@ -182,7 +180,7 @@ cpc_ctx_walk_step(mdb_walk_state_t *wsp)
 	kcpc_ctx_t ctx;
 	struct cpc_ctx_aux *cca = wsp->walk_data;
 
-	while (wsp->walk_addr == NULL) {
+	while (wsp->walk_addr == 0) {
 		if (cca->cca_bucket == KCPC_HASH_BUCKETS)
 			return (WALK_DONE);
 		wsp->walk_addr = cca->cca_hash[cca->cca_bucket++];
diff --git a/usr/src/cmd/mdb/common/modules/crypto/impl.c b/usr/src/cmd/mdb/common/modules/crypto/impl.c
index fe6b7a4150..0d6cc436a1 100644
--- a/usr/src/cmd/mdb/common/modules/crypto/impl.c
+++ b/usr/src/cmd/mdb/common/modules/crypto/impl.c
@@ -424,7 +424,7 @@ soft_conf_walk_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)	/* then we're done */
+	if (wsp->walk_addr == 0)	/* then we're done */
 		return (WALK_DONE);
 #ifdef DEBUG
 	else
@@ -468,7 +468,7 @@ kcf_soft_conf_entry(uintptr_t addr, uint_t flags, int argc,
 	kcf_soft_conf_entry_t *ptr;
 
 	if ((flags & DCMD_ADDRSPEC) == DCMD_ADDRSPEC) {
-		if (addr == NULL) 	/* not allowed with DCMD_ADDRSPEC */
+		if (addr == 0)	/* not allowed with DCMD_ADDRSPEC */
 			return (DCMD_USAGE);
 		else
 			ptr = (kcf_soft_conf_entry_t *)addr;
diff --git a/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c b/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c
index 14549dca4e..7f06a9777f 100644
--- a/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c
+++ b/usr/src/cmd/mdb/common/modules/crypto/sched_impl.c
@@ -251,7 +251,7 @@ areq_walk_init_common(mdb_walk_state_t *wsp, boolean_t use_first)
 		return (WALK_ERR);
 	}
 	if ((wsp->walk_addr = (use_first ? (uintptr_t)gswq_copy.gs_first :
-	    (uintptr_t)gswq_copy.gs_last)) == NULL) {
+	    (uintptr_t)gswq_copy.gs_last)) == 0) {
 		mdb_printf("Global swq is empty\n");
 		return (WALK_DONE);
 	}
@@ -282,7 +282,7 @@ an_id_walk_init(mdb_walk_state_t *wsp, idwalk_type_t type)
 {
 	kcf_areq_node_t *adn;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must give kcf_areq_node address\n");
 		return (WALK_ERR);
 	}
@@ -334,7 +334,7 @@ an_id_walk_step(mdb_walk_state_t *wsp, idwalk_type_t type)
 	int status;
 	kcf_areq_node_t *ptr;
 
-	if (wsp->walk_addr == NULL)	/* then we're done */
+	if (wsp->walk_addr == 0)	/* then we're done */
 		return (WALK_DONE);
 
 	ptr = wsp->walk_data;
@@ -351,19 +351,19 @@ an_id_walk_step(mdb_walk_state_t *wsp, idwalk_type_t type)
 	switch (type) {
 		case IDNEXT:
 			if ((wsp->walk_addr =
-			    (uintptr_t)ptr->an_idnext) == NULL)
+			    (uintptr_t)ptr->an_idnext) == 0)
 				return (WALK_DONE);
 			break;
 
 		case IDPREV:
 			if ((wsp->walk_addr =
-			    (uintptr_t)ptr->an_idprev) == NULL)
+			    (uintptr_t)ptr->an_idprev) == 0)
 				return (WALK_DONE);
 			break;
 
 		case CTXCHAIN:
 			if ((wsp->walk_addr =
-			    (uintptr_t)ptr->an_ctxchain_next) == NULL)
+			    (uintptr_t)ptr->an_ctxchain_next) == 0)
 				return (WALK_DONE);
 			break;
 
@@ -425,7 +425,7 @@ an_walk_step_common(mdb_walk_state_t *wsp, boolean_t use_next)
 	    wsp->walk_cbdata);
 
 	if ((wsp->walk_addr = (use_next ? (uintptr_t)ptr->an_next :
-	    (uintptr_t)ptr->an_prev)) == NULL)
+	    (uintptr_t)ptr->an_prev)) == 0)
 		return (WALK_DONE);
 
 	return (status);
@@ -556,7 +556,7 @@ crypto_pr_reqid(uintptr_t addr, reqid_data_t *data, reqid_cb_data_t *cbdata)
 	int i;
 	int needhdr = TRUE;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_printf("kcf_reqid_table[%d] = NULL\n", data->rd_cur_index);
 		return (WALK_NEXT);
 	}
@@ -585,7 +585,7 @@ crypto_pr_reqid(uintptr_t addr, reqid_data_t *data, reqid_cb_data_t *cbdata)
 		mdb_printf("DEBUG: node_addr = %p\n", node_addr);
 #endif
 
-		if (node_addr == NULL)
+		if (node_addr == 0)
 			break;  /* skip */
 
 		if (mdb_vread(&node, sizeof (kcf_areq_node_t), node_addr)
diff --git a/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c b/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
index d2885c75a7..86a9b9049d 100644
--- a/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
+++ b/usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
@@ -52,7 +52,7 @@
 int
 id2probe(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
-	uintptr_t probe = NULL;
+	uintptr_t probe = 0;
 	uintptr_t probes;
 
 	if (!(flags & DCMD_ADDRSPEC))
@@ -114,7 +114,7 @@ dtracemdb_eprobe(dtrace_state_t *state, dtrace_eprobedesc_t *epd)
 		return (-1);
 	}
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("epid %d doesn't match an ecb\n", epid);
 		return (-1);
 	}
@@ -135,7 +135,7 @@ dtracemdb_eprobe(dtrace_state_t *state, dtrace_eprobedesc_t *epd)
 	 * This is a little painful:  in order to find the number of actions,
 	 * we need to first walk through them.
 	 */
-	for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != NULL; ) {
+	for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != 0; ) {
 		if (mdb_vread(&act, sizeof (act), ap) == -1) {
 			mdb_warn("failed to read action %p on ecb %p",
 			    ap, addr);
@@ -154,7 +154,7 @@ dtracemdb_eprobe(dtrace_state_t *state, dtrace_eprobedesc_t *epd)
 	epd->dtepd_uarg = ecb.dte_uarg;
 	epd->dtepd_size = ecb.dte_size;
 
-	for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != NULL; ) {
+	for (ap = (uintptr_t)ecb.dte_action, nactions = 0; ap != 0; ) {
 		if (mdb_vread(&act, sizeof (act), ap) == -1) {
 			mdb_warn("failed to read action %p on ecb %p",
 			    ap, addr);
@@ -204,11 +204,11 @@ dtracemdb_probe(dtrace_state_t *state, dtrace_probedesc_t *pd)
 			return (-1);
 		}
 
-		if (paddr != NULL)
+		if (paddr != 0)
 			break;
 	}
 
-	if (paddr == NULL) {
+	if (paddr == 0) {
 		errno = ESRCH;
 		return (-1);
 	}
@@ -274,7 +274,7 @@ dtracemdb_aggdesc(dtrace_state_t *state, dtrace_aggdesc_t *agd)
 		return (-1);
 	}
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("aggid %d doesn't match an aggregation\n", aggid);
 		return (-1);
 	}
@@ -810,7 +810,7 @@ dtracemdb_stat(void *varg, processorid_t cpu)
 		return (-1);
 	}
 
-	if (caddr == NULL)
+	if (caddr == 0)
 		return (-1);
 
 	if (mdb_vread(&c, sizeof (c), caddr) == -1) {
@@ -1177,7 +1177,7 @@ dtrace_errhash_init(mdb_walk_state_t *wsp)
 	uintptr_t *hash, addr;
 	int i;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("dtrace_errhash walk only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -1277,7 +1277,7 @@ dtrace_helptrace_init(mdb_walk_state_t *wsp)
 	uint32_t next;
 	uintptr_t buffer;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("dtrace_helptrace only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -1287,7 +1287,7 @@ dtrace_helptrace_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (buffer == NULL) {
+	if (buffer == 0) {
 		mdb_warn("helper tracing is not enabled\n");
 		return (WALK_ERR);
 	}
@@ -1521,7 +1521,7 @@ dtrace_state_init(mdb_walk_state_t *wsp)
 	minor_t max = 0;
 	dtrace_state_walk_t *dw;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("dtrace_state only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -1745,7 +1745,7 @@ dtrace_aggkey_init(mdb_walk_state_t *wsp)
 	dtrace_aggkey_data_t *data;
 	size_t hsize;
 
-	if ((addr = wsp->walk_addr) == NULL) {
+	if ((addr = wsp->walk_addr) == 0) {
 		mdb_warn("dtrace_aggkey walk needs aggregation buffer\n");
 		return (WALK_ERR);
 	}
@@ -1789,7 +1789,7 @@ dtrace_aggkey_step(mdb_walk_state_t *wsp)
 	dtrace_aggkey_t key;
 	uintptr_t addr;
 
-	while ((addr = data->dtakd_next) == NULL) {
+	while ((addr = data->dtakd_next) == 0) {
 		if (data->dtakd_ndx == data->dtakd_hashsize)
 			return (WALK_DONE);
 
@@ -1834,7 +1834,7 @@ dtrace_dynvar_init(mdb_walk_state_t *wsp)
 	size_t hsize;
 	GElf_Sym sym;
 
-	if ((addr = wsp->walk_addr) == NULL) {
+	if ((addr = wsp->walk_addr) == 0) {
 		mdb_warn("dtrace_dynvar walk needs dtrace_dstate_t\n");
 		return (WALK_ERR);
 	}
@@ -2377,7 +2377,7 @@ dtrace_ecb_init(mdb_walk_state_t *wsp)
 	dtrace_state_t state;
 	dtrace_ecb_walk_t *ecbwp;
 
-	if ((addr = wsp->walk_addr) == NULL) {
+	if ((addr = wsp->walk_addr) == 0) {
 		mdb_warn("dtrace_ecb walk needs dtrace_state_t\n");
 		return (WALK_ERR);
 	}
@@ -2416,7 +2416,7 @@ dtrace_ecb_step(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (ecbp == NULL)
+	if (ecbp == 0)
 		return (WALK_NEXT);
 
 	return (wsp->walk_callback(ecbp, NULL, wsp->walk_cbdata));
@@ -2579,7 +2579,7 @@ pid2state_init(mdb_walk_state_t *wsp)
 	struct dev_info info;
 	pid_t pid = (pid_t)wsp->walk_addr;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("pid2state walk requires PID\n");
 		return (WALK_ERR);
 	}
@@ -2669,7 +2669,7 @@ dtrace_probes_walk(uintptr_t addr, void *ignored, uintptr_t *target)
 	dtrace_probe_t probe;
 	dtrace_probedesc_t pd;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&ecb, sizeof (dtrace_ecb_t), addr) == -1) {
@@ -2738,7 +2738,7 @@ dtrace_probes(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 				continue;
 			}
 
-			if (paddr == NULL)
+			if (paddr == 0)
 				continue;
 
 			pd.dtpd_id = i + 1;
diff --git a/usr/src/cmd/mdb/common/modules/fcip/fcip.c b/usr/src/cmd/mdb/common/modules/fcip/fcip.c
index aebaf7496c..db45b17cdf 100644
--- a/usr/src/cmd/mdb/common/modules/fcip/fcip.c
+++ b/usr/src/cmd/mdb/common/modules/fcip/fcip.c
@@ -42,7 +42,7 @@
 static int
 fcip_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "fcip_port_head") == -1) {
 		mdb_warn("failed to read 'fcip_port_head'");
 		return (WALK_ERR);
@@ -57,7 +57,7 @@ fcip_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (fcip_port_info_t),
diff --git a/usr/src/cmd/mdb/common/modules/fcp/fcp.c b/usr/src/cmd/mdb/common/modules/fcp/fcp.c
index a16e3a1308..ac20843143 100644
--- a/usr/src/cmd/mdb/common/modules/fcp/fcp.c
+++ b/usr/src/cmd/mdb/common/modules/fcp/fcp.c
@@ -47,7 +47,7 @@ static uint32_t	tgt_hash_index;
 static int
 fcp_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "fcp_port_head") == -1) {
 		mdb_warn("failed to read 'fcp_port_head'");
 		return (WALK_ERR);
@@ -62,7 +62,7 @@ fcp_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct fcp_port),
@@ -186,7 +186,7 @@ fcp(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 cmds_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Can not perform global walk");
 		return (WALK_ERR);
 	}
@@ -213,7 +213,7 @@ cmds_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct fcp_pkt),
@@ -248,7 +248,7 @@ cmds_walk_f(mdb_walk_state_t *wsp)
 static int
 luns_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Can not perform global walk");
 		return (WALK_ERR);
 	}
@@ -275,7 +275,7 @@ luns_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct fcp_lun),
@@ -310,7 +310,7 @@ luns_walk_f(mdb_walk_state_t *wsp)
 static int
 targets_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Can not perform global walk\n");
 		return (WALK_ERR);
 	}
@@ -345,7 +345,7 @@ targets_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if ((wsp->walk_addr == NULL) &&
+	if ((wsp->walk_addr == 0) &&
 	    (tgt_hash_index >= (FCP_NUM_HASH - 1))) {
 		return (WALK_DONE);
 	}
@@ -362,7 +362,7 @@ targets_walk_s(mdb_walk_state_t *wsp)
 	wsp->walk_addr =
 	    (uintptr_t)(((struct fcp_tgt *)wsp->walk_data)->tgt_next);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		/*
 		 * locate the next hash list
 		 */
@@ -402,7 +402,7 @@ targets_walk_f(mdb_walk_state_t *wsp)
 static int
 ipkt_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("The address of a fcp_port"
 		    " structure must be given\n");
 		return (WALK_ERR);
@@ -431,7 +431,7 @@ ipkt_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct fcp_ipkt),
@@ -466,7 +466,7 @@ ipkt_walk_f(mdb_walk_state_t *wsp)
 static int
 pkt_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("The address of a fcp_port"
 		    " structure must be given\n");
 		return (WALK_ERR);
@@ -495,7 +495,7 @@ pkt_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct fcp_pkt),
diff --git a/usr/src/cmd/mdb/common/modules/fctl/fctl.c b/usr/src/cmd/mdb/common/modules/fctl/fctl.c
index 89a8139c83..3df25d1527 100644
--- a/usr/src/cmd/mdb/common/modules/fctl/fctl.c
+++ b/usr/src/cmd/mdb/common/modules/fctl/fctl.c
@@ -74,7 +74,7 @@ struct fc_local_port port;
 static int
 port_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "fctl_fca_portlist") == -1) {
 		mdb_warn("failed to read 'fctl_fca_portlist'");
 		return (WALK_ERR);
@@ -93,7 +93,7 @@ port_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (fc_fca_port_t), wsp->walk_addr)
@@ -201,7 +201,7 @@ ports(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 ulp_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "fctl_ulp_list") == -1) {
 		mdb_warn("failed to read 'fctl_ulp_list'");
 		return (WALK_ERR);
@@ -218,7 +218,7 @@ ulp_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (fc_ulp_list_t), wsp->walk_addr)
@@ -311,7 +311,7 @@ ulps(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 ulpmod_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "fctl_ulp_modules") == -1) {
 		mdb_warn("failed to read 'fctl_ulp_modules'");
 		return (WALK_ERR);
@@ -328,7 +328,7 @@ ulpmod_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (fc_ulp_module_t), wsp->walk_addr)
@@ -580,7 +580,7 @@ pd_by_pwwn_walk_i(mdb_walk_state_t *wsp)
 {
 	fc_local_port_t port;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("pd_by_pwwn walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -632,7 +632,7 @@ pd_by_pwwn_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if ((wsp->walk_addr == NULL) &&
+	if ((wsp->walk_addr == 0) &&
 	    (pd_hash_index >= (PWWN_HASH_TABLE_SIZE - 1))) {
 		return (WALK_DONE);
 	}
@@ -649,7 +649,7 @@ pd_by_pwwn_walk_s(mdb_walk_state_t *wsp)
 	wsp->walk_addr =
 	    (uintptr_t)(((fc_remote_port_t *)wsp->walk_data)->pd_wwn_hnext);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		/*
 		 * Try the next hash list, if there is one.
 		 */
@@ -694,7 +694,7 @@ pd_by_did_walk_i(mdb_walk_state_t *wsp)
 {
 	fc_local_port_t port;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("pd_by_did walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -745,7 +745,7 @@ pd_by_did_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if ((wsp->walk_addr == NULL) &&
+	if ((wsp->walk_addr == 0) &&
 	    (pd_hash_index >= (D_ID_HASH_TABLE_SIZE - 1))) {
 		return (WALK_DONE);
 	}
@@ -762,7 +762,7 @@ pd_by_did_walk_s(mdb_walk_state_t *wsp)
 	wsp->walk_addr =
 	    (uintptr_t)(((fc_remote_port_t *)wsp->walk_data)->pd_did_hnext);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		/*
 		 * Try the next hash list, if there is one.
 		 */
@@ -1175,7 +1175,7 @@ fcp_trace_dump(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 job_request_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("The address of a fc_local_port"
 		    " structure must be given\n");
 		return (WALK_ERR);
@@ -1204,7 +1204,7 @@ job_request_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct job_request),
@@ -1245,7 +1245,7 @@ job_request_walk_f(mdb_walk_state_t *wsp)
 static int
 orphan_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("The address of a fc_local_port"
 		    " structure must be given\n");
 		return (WALK_ERR);
@@ -1274,7 +1274,7 @@ orphan_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct fc_orphan),
diff --git a/usr/src/cmd/mdb/common/modules/genunix/avl.c b/usr/src/cmd/mdb/common/modules/genunix/avl.c
index d5def7b604..771240b29a 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/avl.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/avl.c
@@ -114,7 +114,7 @@ avl_walk_init_range(mdb_walk_state_t *wsp, uintptr_t begin, uintptr_t end,
 	 * "node" always points at the avl_node_t field inside the struct
 	 */
 	aw->aw_buff = mdb_zalloc(tree->avl_size, UM_SLEEP);
-	aw->aw_end = (end == NULL ? NULL : end + tree->avl_offset);
+	aw->aw_end = (end == 0 ? 0 : end + tree->avl_offset);
 	aw->aw_elem_name = element_name;
 	aw->aw_elem_check = element_check;
 	aw->aw_elem_check_arg = arg;
@@ -123,10 +123,10 @@ avl_walk_init_range(mdb_walk_state_t *wsp, uintptr_t begin, uintptr_t end,
 	 * get the first avl_node_t address, use same algorithm
 	 * as avl_start() -- leftmost child in tree from root
 	 */
-	if (begin == NULL) {
+	if (begin == 0) {
 		addr = (uintptr_t)tree->avl_root;
-		if (addr == NULL) {
-			wsp->walk_addr = NULL;
+		if (addr == 0) {
+			wsp->walk_addr = 0;
 			return (WALK_NEXT);
 		}
 		addr = avl_leftmostchild(addr, aw->aw_buff, tree->avl_offset,
@@ -150,14 +150,14 @@ error:
 int
 avl_walk_init(mdb_walk_state_t *wsp)
 {
-	return (avl_walk_init_range(wsp, NULL, NULL, NULL, NULL, NULL, NULL));
+	return (avl_walk_init_range(wsp, 0, 0, NULL, NULL, NULL, NULL));
 }
 
 int
 avl_walk_init_named(mdb_walk_state_t *wsp,
     const char *avl_name, const char *element_name)
 {
-	return (avl_walk_init_range(wsp, NULL, NULL, avl_name, element_name,
+	return (avl_walk_init_range(wsp, 0, 0, avl_name, element_name,
 	    NULL, NULL));
 }
 
@@ -166,7 +166,7 @@ avl_walk_init_checked(mdb_walk_state_t *wsp,
     const char *avl_name, const char *element_name,
     int (*element_check)(void *, uintptr_t, void *), void *arg)
 {
-	return (avl_walk_init_range(wsp, NULL, NULL, avl_name, element_name,
+	return (avl_walk_init_range(wsp, 0, 0, avl_name, element_name,
 	    element_check, arg));
 }
 
@@ -189,12 +189,12 @@ avl_walk_step(mdb_walk_state_t *wsp)
 	 * don't walk past the end of the tree!
 	 */
 	addr = wsp->walk_addr;
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	aw = (struct aw_info *)wsp->walk_data;
 
-	if (aw->aw_end != NULL && wsp->walk_addr == aw->aw_end)
+	if (aw->aw_end != 0 && wsp->walk_addr == aw->aw_end)
 		return (WALK_DONE);
 
 	size = aw->aw_tree.avl_size;
@@ -235,7 +235,7 @@ avl_walk_step(mdb_walk_state_t *wsp)
 	 * thru as many left children as possible
 	 */
 	addr = (uintptr_t)node->avl_child[1];
-	if (addr != NULL) {
+	if (addr != 0) {
 		addr = avl_leftmostchild(addr, aw->aw_buff, offset, size,
 		    aw->aw_elem_name);
 		if (addr == (uintptr_t)-1L)
@@ -249,7 +249,7 @@ avl_walk_step(mdb_walk_state_t *wsp)
 		for (;;) {
 			was_child = AVL_XCHILD(node);
 			addr = (uintptr_t)AVL_XPARENT(node);
-			if (addr == NULL)
+			if (addr == 0)
 				break;
 			addr -= offset;
 			if (was_child == 0) /* stop on return from left child */
diff --git a/usr/src/cmd/mdb/common/modules/genunix/bio.c b/usr/src/cmd/mdb/common/modules/genunix/bio.c
index 6951037dca..9f4c507672 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/bio.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/bio.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_modapi.h>
 #include <sys/buf.h>
 #include <sys/var.h>
@@ -52,7 +50,7 @@ buf_walk_init(mdb_walk_state_t *wsp)
 
 	buf_walk_t *bwp;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("only global buf walk supported\n");
 		return (WALK_ERR);
 	}
@@ -101,7 +99,7 @@ buf_walk_step(mdb_walk_state_t *wsp)
 	 * hbuf itself, advance to the next hash bucket.  When we reach
 	 * bw_nhbufs, we're done.
 	 */
-	while (wsp->walk_addr == NULL || wsp->walk_addr == (bwp->bw_hbufbase +
+	while (wsp->walk_addr == 0 || wsp->walk_addr == (bwp->bw_hbufbase +
 	    bwp->bw_hbufi * sizeof (struct hbuf))) {
 
 		if (++bwp->bw_hbufi == bwp->bw_nhbufs)
@@ -153,7 +151,7 @@ bufpagefind(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	if (mdb_vread(&b, sizeof (buf_t), b_addr) == -1)
 		return (DCMD_ERR);
 
-	for (addr = (uintptr_t)b.b_pages; addr != NULL;
+	for (addr = (uintptr_t)b.b_pages; addr != 0;
 	    addr = (uintptr_t)p.p_next) {
 
 		if (addr == arg) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/contract.c b/usr/src/cmd/mdb/common/modules/genunix/contract.c
index 3df7c2961c..d20da37085 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/contract.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/contract.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_modapi.h>
 #include <sys/types.h>
 #include <sys/contract_impl.h>
@@ -33,7 +31,7 @@
 int
 ct_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		wsp->walk_addr = wsp->walk_addr +
 		    OFFSETOF(ct_type_t, ct_type_avl);
 	} else {
@@ -54,7 +52,7 @@ ct_walk_init(mdb_walk_state_t *wsp)
 int
 ct_event_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("ct_event walker requires ct_equeue address\n");
 		return (WALK_ERR);
 	}
@@ -71,7 +69,7 @@ ct_event_walk_init(mdb_walk_state_t *wsp)
 int
 ct_listener_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("ct_listener walker requires ct_equeue address\n");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/genunix/cpupart.c b/usr/src/cmd/mdb/common/modules/genunix/cpupart.c
index 3f2a51dcfc..1ce683c4c9 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/cpupart.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/cpupart.c
@@ -24,9 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-
 #include <mdb/mdb_param.h>
 #include <mdb/mdb_modapi.h>
 #include <mdb/mdb_ks.h>
@@ -93,7 +90,7 @@ cpupart_disp_threads(disp_t *disp)
 	for (i = npri - 1; i >= 0; i--) {
 		uintptr_t taddr = (uintptr_t)dq[i].dq_first;
 
-		while (taddr != NULL) {
+		while (taddr != 0) {
 			if (mdb_vread(&t, sizeof (t), taddr) == -1) {
 				mdb_warn("failed to read kthread_t at %p",
 				    taddr);
@@ -203,7 +200,7 @@ cpupart(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 typedef struct cpupart_cpulist_walk {
 	uintptr_t	ccw_firstcpu;
-	int 		ccw_cpusleft;
+	int		ccw_cpusleft;
 } cpupart_cpulist_walk_t;
 
 int
diff --git a/usr/src/cmd/mdb/common/modules/genunix/ctxop.c b/usr/src/cmd/mdb/common/modules/genunix/ctxop.c
index 302ffa03c9..486113031d 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/ctxop.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/ctxop.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/mdb_modapi.h>
 #include <sys/thread.h>
 #include "ctxop.h"
@@ -35,7 +33,7 @@ ctxop_walk_init(mdb_walk_state_t *wsp)
 {
 	kthread_t thread, *tp = &thread;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must specify thread for ctxop walk\n");
 		return (WALK_ERR);
 	}
@@ -55,7 +53,7 @@ ctxop_walk_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data,
diff --git a/usr/src/cmd/mdb/common/modules/genunix/cyclic.c b/usr/src/cmd/mdb/common/modules/genunix/cyclic.c
index 7c05990599..391c7178bb 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/cyclic.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/cyclic.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "cyclic.h"
 
 #define	CYCLIC_TRACE
@@ -88,7 +86,7 @@ cycomni_walk_init(mdb_walk_state_t *wsp)
 {
 	cyc_id_t id;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must provide a cyclic id\n");
 		return (WALK_ERR);
 	}
@@ -115,7 +113,7 @@ cycomni_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	cyc_omni_cpu_t omni;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&omni, sizeof (omni), addr) == -1) {
@@ -471,7 +469,7 @@ cyctrace_walk_init(mdb_walk_state_t *wsp)
 
 	cpu = mdb_zalloc(sizeof (cyc_cpu_t), UM_SLEEP);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		/*
 		 * If an address isn't provided, we'll use the passive buffer.
 		 */
@@ -595,7 +593,7 @@ int
 cyctrace(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	if (!(flags & DCMD_ADDRSPEC) || argc != 0)
-		addr = NULL;
+		addr = 0;
 
 	if (mdb_pwalk("cyctrace", (mdb_walk_cb_t)cyctrace_walk,
 	    (void *)addr, addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/devinfo.c b/usr/src/cmd/mdb/common/modules/genunix/devinfo.c
index d5da280040..081129a2ce 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/devinfo.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/devinfo.c
@@ -138,10 +138,10 @@ devinfo_parents_walk_init(mdb_walk_state_t *wsp)
 
 	if (mdb_readvar(&devinfo_root, "top_devinfo") == -1) {
 		mdb_warn("failed to read 'top_devinfo'");
-		return (NULL);
+		return (0);
 	}
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		wsp->walk_addr = devinfo_root;
 	addr = wsp->walk_addr;
 
@@ -233,10 +233,10 @@ devinfo_children_walk_init(mdb_walk_state_t *wsp)
 
 	if (mdb_readvar(&devinfo_root, "top_devinfo") == -1) {
 		mdb_warn("failed to read 'top_devinfo'");
-		return (NULL);
+		return (0);
 	}
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		wsp->walk_addr = devinfo_root;
 
 	dic = mdb_alloc(sizeof (devinfo_children_walk_data_t), UM_SLEEP);
@@ -266,7 +266,7 @@ devinfo_children_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	int status = WALK_NEXT;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&dic->dic_dev, sizeof (dic->dic_dev), addr) == -1) {
@@ -447,7 +447,7 @@ devnames_walk_init(mdb_walk_state_t *wsp)
 	int devcnt;
 	uintptr_t devnamesp;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("devnames walker only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -508,7 +508,7 @@ devinfo_siblings_walk_init(mdb_walk_state_t *wsp)
 	struct dev_info di;
 	uintptr_t addr = wsp->walk_addr;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("a dev_info struct address must be provided\n");
 		return (WALK_ERR);
 	}
@@ -539,7 +539,7 @@ devinfo_siblings_walk_step(mdb_walk_state_t *wsp)
 	struct dev_info di;
 	uintptr_t addr = wsp->walk_addr;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&di, sizeof (di), addr) == -1) {
@@ -557,7 +557,7 @@ devi_next_walk_step(mdb_walk_state_t *wsp)
 	struct dev_info di;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&di, sizeof (di), wsp->walk_addr) == -1)
@@ -654,27 +654,27 @@ devinfo_print_props_value(int elem_size, int nelem,
  * Guesses how to interpret the value of the property
  *
  * Params:
- * 	type      - Should be the type value of the property
- * 	prop_val  - Pointer to the property value data buffer
- * 	prop_len  - Length of the property value data buffer
+ *	type      - Should be the type value of the property
+ *	prop_val  - Pointer to the property value data buffer
+ *	prop_len  - Length of the property value data buffer
  *
  * Return values:
- * 	nelem     - The number of elements stored in the property value
- * 			data buffer pointed to by prop_val.
- * 	elem_size - The size (in bytes) of the elements stored in the property
- * 			value data buffer pointed to by prop_val.
- * 			Upon return if elem_size == 0 and nelem != 0 then
- * 			the property value data buffer contains strings
- * 	len_err   - There was an error with the length of the data buffer.
- * 			Its size is not a multiple of the array value type.
- * 			It will be interpreted as an array of bytes.
+ *	nelem     - The number of elements stored in the property value
+ *			data buffer pointed to by prop_val.
+ *	elem_size - The size (in bytes) of the elements stored in the property
+ *			value data buffer pointed to by prop_val.
+ *			Upon return if elem_size == 0 and nelem != 0 then
+ *			the property value data buffer contains strings
+ *	len_err   - There was an error with the length of the data buffer.
+ *			Its size is not a multiple of the array value type.
+ *			It will be interpreted as an array of bytes.
  */
 static void
 devinfo_print_props_guess(int type, unsigned char *prop_val, int prop_len,
     int *elem_size, int *nelem, int *len_err)
 {
 	*len_err = 0;
-	if (prop_len == NULL) {
+	if (prop_len == 0) {
 		*elem_size = 0;
 		*nelem = 0;
 		return;
@@ -1061,7 +1061,7 @@ prtconf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if (mdb_readvar(&devinfo_root, "top_devinfo") == -1) {
 		mdb_warn("failed to read 'top_devinfo'");
-		return (NULL);
+		return (0);
 	}
 
 	if ((flags & DCMD_ADDRSPEC) == 0) {
@@ -1564,7 +1564,7 @@ soft_state_walk_init(mdb_walk_state_t *wsp)
 	soft_state_walk_t *sst;
 
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	sst = mdb_zalloc(sizeof (soft_state_walk_t), UM_SLEEP|UM_GC);
@@ -1707,7 +1707,7 @@ devbindings(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 binding_hash_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	wsp->walk_data = mdb_alloc(sizeof (void *) * MOD_BIND_HASHSIZE,
@@ -1735,7 +1735,7 @@ binding_hash_walk_step(mdb_walk_state_t *wsp)
 	 * Walk the singly-linked list of struct bind
 	 */
 	bind_p = ((uintptr_t *)wsp->walk_data)[(ulong_t)wsp->walk_arg];
-	while (bind_p != NULL) {
+	while (bind_p != 0) {
 
 		if (mdb_vread(&bind, sizeof (bind), bind_p) == -1) {
 			mdb_warn("failed to read bind struct at %p",
@@ -1764,16 +1764,16 @@ int
 binding_hash_entry(uintptr_t addr, uint_t flags, int argc,
     const mdb_arg_t *argv)
 {
-	struct bind 	bind;
+	struct bind	bind;
 	/* Arbitrary lengths based on output format below */
 	char name[MAXPATHLEN] = "???";
 	char bind_name[MAXPATHLEN] = "<null>";
 
-	if ((flags & DCMD_ADDRSPEC) == NULL)
+	if ((flags & DCMD_ADDRSPEC) == 0)
 		return (DCMD_USAGE);
 
 	/* Allow null addresses to be passed (as from a walker) */
-	if (addr == NULL)
+	if (addr == 0)
 		return (DCMD_OK);
 
 	if (mdb_vread(&bind, sizeof (bind), addr) == -1) {
@@ -1855,7 +1855,7 @@ devinfo_audit_log_walk_step(mdb_walk_state_t *wsp)
 	int status = WALK_NEXT;
 
 	/* read in current entry and invoke callback */
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&dil->dil_buf, sizeof (devinfo_audit_t), addr) == -1) {
@@ -1868,7 +1868,7 @@ devinfo_audit_log_walk_step(mdb_walk_state_t *wsp)
 	if (--dil->dil_index < 0)
 		dil->dil_index += dil->dil_max;
 	if (dil->dil_index == dil->dil_start) {
-		wsp->walk_addr = NULL;
+		wsp->walk_addr = 0;
 		return (WALK_DONE);
 	}
 
@@ -1991,7 +1991,7 @@ devinfo_audit_node_walk_step(mdb_walk_state_t *wsp)
 	devinfo_audit_node_walk_data_t *dih = wsp->walk_data;
 	devinfo_audit_t *da = &dih->dih_buf;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 	(void) wsp->walk_callback(wsp->walk_addr, NULL, wsp->walk_cbdata);
 
@@ -2117,7 +2117,7 @@ devinfo_fmc_walk_init(mdb_walk_state_t *wsp)
 {
 	struct i_ddi_fmc fec;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&fec, sizeof (fec), wsp->walk_addr) == -1) {
@@ -2159,7 +2159,7 @@ minornode_walk_init(mdb_walk_state_t *wsp)
 	struct dev_info di;
 	uintptr_t addr = wsp->walk_addr;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("a dev_info struct address must be provided\n");
 		return (WALK_ERR);
 	}
@@ -2179,7 +2179,7 @@ minornode_walk_step(mdb_walk_state_t *wsp)
 	struct ddi_minor_data md;
 	uintptr_t addr = wsp->walk_addr;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&md, sizeof (md), addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/dnlc.c b/usr/src/cmd/mdb/common/modules/genunix/dnlc.c
index 27a93c4ae7..1e8ae802d8 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/dnlc.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/dnlc.c
@@ -31,7 +31,7 @@ dnlc_walk_init(mdb_walk_state_t *wsp)
 {
 	dnlc_walk_t *dwp;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("dnlc walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -66,7 +66,7 @@ dnlc_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t result, addr = wsp->walk_addr;
 
 next:
-	while (addr == dwp->dw_head || addr == NULL) {
+	while (addr == dwp->dw_head || addr == 0) {
 		if (dwp->dw_index >= dwp->dw_hashsz) {
 			return (WALK_DONE);
 		}
@@ -87,7 +87,7 @@ next:
 		 * This entry may have become bogus since acquiring the address
 		 * from its neighbor.  Continue on if that is the case.
 		 */
-		addr = NULL;
+		addr = 0;
 		goto next;
 	}
 	wsp->walk_addr = addr;
diff --git a/usr/src/cmd/mdb/common/modules/genunix/findstack_subr.c b/usr/src/cmd/mdb/common/modules/genunix/findstack_subr.c
index 6fec78c5c5..0636c8e1b4 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/findstack_subr.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/findstack_subr.c
@@ -117,7 +117,7 @@ crawl(uintptr_t frame, uintptr_t kbase, uintptr_t ktop, uintptr_t ubase,
 		 */
 		if (kill_fp) {
 			fs_dprintf(("<7> fpp = %p\n", fpp));
-			*fpp = NULL;
+			*fpp = 0;
 		}
 
 		fs_dprintf(("<8> levels = %d\n", levels));
diff --git a/usr/src/cmd/mdb/common/modules/genunix/fm.c b/usr/src/cmd/mdb/common/modules/genunix/fm.c
index d02639fc4f..be67161908 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/fm.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/fm.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/sysmacros.h>
@@ -47,7 +45,7 @@ ereportq_pend_walk_init(mdb_walk_state_t *wsp)
 	errorq_t eq;
 	uintptr_t addr;
 
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&addr, "ereport_errorq") == -1) {
 		mdb_warn("failed to read ereport_errorq");
 		return (WALK_ERR);
@@ -76,7 +74,7 @@ ereportq_pend_walk_step(mdb_walk_state_t *wsp)
 	errorq_nvelem_t eqnp;
 	errorq_elem_t elem;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&elem, sizeof (elem), addr) != sizeof (elem) ||
@@ -99,7 +97,7 @@ ereportq_dump_walk_init(mdb_walk_state_t *wsp)
 	errorq_t eq;
 	uintptr_t addr;
 
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&addr, "ereport_errorq") == -1) {
 		mdb_warn("failed to read ereport_errorq");
 		return (WALK_ERR);
@@ -128,7 +126,7 @@ ereportq_dump_walk_step(mdb_walk_state_t *wsp)
 	errorq_nvelem_t eqnp;
 	errorq_elem_t elem;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&elem, sizeof (elem), addr) != sizeof (elem) ||
diff --git a/usr/src/cmd/mdb/common/modules/genunix/gcore.c b/usr/src/cmd/mdb/common/modules/genunix/gcore.c
index 567160de8b..fb1f20b06c 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/gcore.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/gcore.c
@@ -165,7 +165,7 @@ gsvn_init(gcore_seg_t *gs)
 	struct vpage		*vpage = NULL;
 	size_t			nvpage = 0;
 
-	if (seg->s_data != NULL) {
+	if (seg->s_data != 0) {
 		svd = mdb_alloc(sizeof (*svd), UM_SLEEP);
 		if (mdb_ctf_vread(svd, "segvn_data_t", "mdb_segvn_data_t",
 		    seg->s_data, 0) == -1) {
@@ -780,7 +780,7 @@ read_maps_cb(uintptr_t seg_addr, const void *aw_buff, void *arg)
 		if (seg->s_ops == gcore_segvn_ops) {
 			if (mdb_ctf_vread(&svd, "segvn_data_t",
 			    "mdb_segvn_data_t", seg->s_data, 0) == 0 &&
-			    svd.vp == NULL) {
+			    svd.vp == 0) {
 				mp->pr_mflags |= MA_ANON;
 			}
 		}
@@ -875,25 +875,25 @@ gcore_prchoose(mdb_proc_t *p)
 	mdb_kthread_t	*t = &kthr;
 	ushort_t	t_istop_whystop = 0;
 	ushort_t	t_istop_whatstop = 0;
-	uintptr_t	t_addr = NULL;
-	uintptr_t	t_onproc = NULL; // running on processor
-	uintptr_t	t_run = NULL;	 // runnable, on disp queue
-	uintptr_t	t_sleep = NULL;	 // sleeping
-	uintptr_t	t_susp = NULL;	 // suspended stop
-	uintptr_t	t_jstop = NULL;	 // jobcontrol stop, w/o directed stop
-	uintptr_t	t_jdstop = NULL; // jobcontrol stop with directed stop
-	uintptr_t	t_req = NULL;	 // requested stop
-	uintptr_t	t_istop = NULL;	 // event-of-interest stop
-	uintptr_t	t_dtrace = NULL; // DTrace stop
+	uintptr_t	t_addr = 0;
+	uintptr_t	t_onproc = 0;	/* running on processor */
+	uintptr_t	t_run = 0;	/* runnable, on disp queue */
+	uintptr_t	t_sleep = 0;	/* sleeping */
+	uintptr_t	t_susp = 0;	/* suspended stop */
+	uintptr_t	t_jstop = 0;	/* jobcontrol stop, w/o directed stop */
+	uintptr_t	t_jdstop = 0;	/* jobcontrol stop with directed stop */
+	uintptr_t	t_req = 0;	/* requested stop */
+	uintptr_t	t_istop = 0;	/* event-of-interest stop */
+	uintptr_t	t_dtrace = 0;	/* DTrace stop */
 
 	/*
 	 * If the agent lwp exists, it takes precedence over all others.
 	 */
-	if ((t_addr = p->p_agenttp) != NULL) {
+	if ((t_addr = p->p_agenttp) != 0) {
 		return (t_addr);
 	}
 
-	if ((t_addr = p->p_tlist) == NULL) /* start at the head of the list */
+	if ((t_addr = p->p_tlist) == 0) /* start at the head of the list */
 		return (t_addr);
 	do {		/* for each lwp in the process */
 		if (mdb_ctf_vread(&kthr, "kthread_t", "mdb_kthread_t",
@@ -902,7 +902,7 @@ gcore_prchoose(mdb_proc_t *p)
 		}
 
 		if (VSTOPPED(t)) {	/* virtually stopped */
-			if (t_req == NULL)
+			if (t_req == 0)
 				t_req = t_addr;
 			continue;
 		}
@@ -911,16 +911,16 @@ gcore_prchoose(mdb_proc_t *p)
 		default:
 			return (0);
 		case TS_SLEEP:
-			if (t_sleep == NULL)
+			if (t_sleep == 0)
 				t_sleep = t_addr;
 			break;
 		case TS_RUN:
 		case TS_WAIT:
-			if (t_run == NULL)
+			if (t_run == 0)
 				t_run = t_addr;
 			break;
 		case TS_ONPROC:
-			if (t_onproc == NULL)
+			if (t_onproc == 0)
 				t_onproc = t_addr;
 			break;
 			/*
@@ -932,22 +932,22 @@ gcore_prchoose(mdb_proc_t *p)
 		case TS_STOPPED:
 			switch (t->t_whystop) {
 			case PR_SUSPENDED:
-				if (t_susp == NULL)
+				if (t_susp == 0)
 					t_susp = t_addr;
 				break;
 			case PR_JOBCONTROL:
 				if (t->t_proc_flag & TP_PRSTOP) {
-					if (t_jdstop == NULL)
+					if (t_jdstop == 0)
 						t_jdstop = t_addr;
 				} else {
-					if (t_jstop == NULL)
+					if (t_jstop == 0)
 						t_jstop = t_addr;
 				}
 				break;
 			case PR_REQUESTED:
-				if (t->t_dtrace_stop && t_dtrace == NULL)
+				if (t->t_dtrace_stop && t_dtrace == 0)
 					t_dtrace = t_addr;
-				else if (t_req == NULL)
+				else if (t_req == 0)
 					t_req = t_addr;
 				break;
 			case PR_SYSENTRY:
@@ -958,7 +958,7 @@ gcore_prchoose(mdb_proc_t *p)
 				 * Make an lwp calling exit() be the
 				 * last lwp seen in the process.
 				 */
-				if (t_istop == NULL ||
+				if (t_istop == 0 ||
 				    (t_istop_whystop == PR_SYSENTRY &&
 				    t_istop_whatstop == SYS_exit)) {
 					t_istop = t_addr;
@@ -1096,7 +1096,7 @@ gcore_schedctl_finish_sigblock(mdb_kthread_t *t)
 	mdb_sc_shared_t td;
 	mdb_sc_shared_t *tdp;
 
-	if (t->t_schedctl == NULL) {
+	if (t->t_schedctl == 0) {
 		return;
 	}
 
@@ -1318,7 +1318,7 @@ gcore_lstatus_cb(mdb_proc_t *p, lwpent_t *lwent, void *data)
 	uintptr_t	t_addr = (uintptr_t)lwent->le_thread;
 	mdb_kthread_t	kthrd;
 
-	if (t_addr == NULL) {
+	if (t_addr == 0) {
 		return (1);
 	}
 
@@ -1694,7 +1694,7 @@ Pstatus_gcore(struct ps_prochandle *P, pstatus_t *sp, void *data)
 	pcommon_t	pc;
 
 	t_addr = gcore_prchoose(p);
-	if (t_addr != NULL) {
+	if (t_addr != 0) {
 		if (mdb_ctf_vread(&kthr, "kthread_t", "mdb_kthread_t", t_addr,
 		    0) == -1) {
 			return;
@@ -1760,7 +1760,7 @@ Ppsinfo_gcore(struct ps_prochandle *P, psinfo_t *psp, void *data)
 	uintptr_t	t_addr;
 	pcommon_t	pc;
 
-	if ((t_addr = gcore_prchoose(p)) == NULL) {
+	if ((t_addr = gcore_prchoose(p)) == 0) {
 		bzero(psp, sizeof (*psp));
 	} else {
 		bzero(psp, sizeof (*psp) - sizeof (psp->pr_lwp));
@@ -1937,7 +1937,7 @@ Pldt_gcore(struct ps_prochandle *P, struct ssd *pldt, int nldt, void *data)
 	size_t		ldt_size;
 	int		i, limit;
 
-	if (p->p_ldt == NULL) {
+	if (p->p_ldt == 0) {
 		return (0);
 	}
 
diff --git a/usr/src/cmd/mdb/common/modules/genunix/genunix.c b/usr/src/cmd/mdb/common/modules/genunix/genunix.c
index 719206065b..61c98952c1 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/genunix.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/genunix.c
@@ -417,12 +417,12 @@ pgrep_cb(uintptr_t addr, const void *ignored, void *data)
 		    p.p_user.u_start.tv_nsec;
 
 		if (pgp->pg_flags & PG_NEWEST) {
-			if (pgp->pg_xaddr == NULL || start > pgp->pg_xstart) {
+			if (pgp->pg_xaddr == 0 || start > pgp->pg_xstart) {
 				pgp->pg_xaddr = addr;
 				pgp->pg_xstart = start;
 			}
 		} else {
-			if (pgp->pg_xaddr == NULL || start < pgp->pg_xstart) {
+			if (pgp->pg_xaddr == 0 || start < pgp->pg_xstart) {
 				pgp->pg_xaddr = addr;
 				pgp->pg_xstart = start;
 			}
@@ -582,7 +582,7 @@ project(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 callout_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("callout doesn't support global walk");
 		return (WALK_ERR);
 	}
@@ -599,7 +599,7 @@ callout_walk_step(mdb_walk_state_t *wsp)
 {
 	int retval;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 	if (mdb_vread(wsp->walk_data, sizeof (callout_t),
@@ -634,7 +634,7 @@ callout_walk_fini(mdb_walk_state_t *wsp)
 int
 callout_list_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("callout list doesn't support global walk");
 		return (WALK_ERR);
 	}
@@ -647,7 +647,7 @@ callout_list_walk_step(mdb_walk_state_t *wsp)
 {
 	int retval;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 	if (mdb_vread(wsp->walk_data, sizeof (callout_list_t),
@@ -689,7 +689,7 @@ callout_table_walk_init(mdb_walk_state_t *wsp)
 
 	cot_walk_data = mdb_alloc(sizeof (cot_data_t), UM_SLEEP);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&cot_walk_data->ct0, "callout_table") == -1) {
 			mdb_warn("failed to read 'callout_table'");
 			return (WALK_ERR);
@@ -1205,7 +1205,7 @@ callout_t_cb(uintptr_t addr, const void *data, void *priv)
 	}
 
 	if (!(coargs->flags & COF_EMPTY) && (
-	    (ct->ct_heap == NULL) || (ct->ct_cyclic == NULL))) {
+	    (ct->ct_heap == NULL) || (ct->ct_cyclic == 0))) {
 		return (WALK_NEXT);
 	}
 
@@ -1545,9 +1545,9 @@ callout(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if (!(flags & DCMD_ADDRSPEC)) {
 		/* don't pass "dot" if no addr. */
-		addr = NULL;
+		addr = 0;
 	}
-	if (addr != NULL) {
+	if (addr != 0) {
 		/*
 		 * a callout table was specified. Ignore -r|n option
 		 * to avoid null output.
@@ -1981,7 +1981,7 @@ lminfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		mdb_printf("%<u>%-?s %2s %4s %6s %-16s %-?s %s%</u>\n",
 		    "ADDR", "TP", "FLAG", "PID", "COMM", "VNODE", "PATH");
 
-	return (mdb_pwalk("lock_graph", lminfo_cb, NULL, NULL));
+	return (mdb_pwalk("lock_graph", lminfo_cb, NULL, 0));
 }
 
 /*ARGSUSED*/
@@ -1990,7 +1990,7 @@ whereopen_fwalk(uintptr_t addr, struct file *f, uintptr_t *target)
 {
 	if ((uintptr_t)f->f_vnode == *target) {
 		mdb_printf("file %p\n", addr);
-		*target = NULL;
+		*target = 0;
 	}
 
 	return (WALK_NEXT);
@@ -2007,7 +2007,7 @@ whereopen_pwalk(uintptr_t addr, void *ignored, uintptr_t *target)
 		return (WALK_ERR);
 	}
 
-	if (t == NULL)
+	if (t == 0)
 		mdb_printf("%p\n", addr);
 
 	return (WALK_NEXT);
@@ -2019,7 +2019,7 @@ whereopen(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	uintptr_t target = addr;
 
-	if (!(flags & DCMD_ADDRSPEC) || addr == NULL)
+	if (!(flags & DCMD_ADDRSPEC) || addr == 0)
 		return (DCMD_USAGE);
 
 	if (mdb_walk("proc", (mdb_walk_cb_t)whereopen_pwalk, &target) == -1) {
@@ -2199,7 +2199,7 @@ kmastat_vmem(uintptr_t addr, const vmem_t *v, const uint_t *shiftp)
 	vmem_t parent;
 	int ident = 0;
 
-	for (paddr = (uintptr_t)v->vm_source; paddr != NULL; ident += 4) {
+	for (paddr = (uintptr_t)v->vm_source; paddr != 0; ident += 4) {
 		if (mdb_vread(&parent, sizeof (parent), paddr) == -1) {
 			mdb_warn("couldn't trace %p's ancestry", addr);
 			ident = 0;
@@ -2482,7 +2482,7 @@ file_walk_init(mdb_walk_state_t *wsp)
 	file_walk_data_t *fw;
 	mdb_file_proc_t p;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("file walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -2531,7 +2531,7 @@ again:
 	if (fw->fw_ndx == fw->fw_nofiles)
 		return (WALK_DONE);
 
-	if ((fp = (uintptr_t)fw->fw_flist[fw->fw_ndx++].uf_file) == NULL)
+	if ((fp = (uintptr_t)fw->fw_flist[fw->fw_ndx++].uf_file) == 0)
 		goto again;
 
 	(void) mdb_vread(&file, sizeof (file), (uintptr_t)fp);
@@ -2548,7 +2548,7 @@ allfile_walk_step(mdb_walk_state_t *wsp)
 	if (fw->fw_ndx == fw->fw_nofiles)
 		return (WALK_DONE);
 
-	if ((fp = (uintptr_t)fw->fw_flist[fw->fw_ndx++].uf_file) != NULL)
+	if ((fp = (uintptr_t)fw->fw_flist[fw->fw_ndx++].uf_file) != 0)
 		(void) mdb_vread(&file, sizeof (file), (uintptr_t)fp);
 	else
 		bzero(&file, sizeof (file));
@@ -2568,7 +2568,7 @@ file_walk_fini(mdb_walk_state_t *wsp)
 int
 port_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("port walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -2619,7 +2619,7 @@ portev_walk_init(mdb_walk_state_t *wsp)
 	struct list	*list;
 	uintptr_t	vp;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("portev walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -2702,7 +2702,7 @@ proc_walk_init(mdb_walk_state_t *wsp)
 	GElf_Sym sym;
 	proc_walk_data_t *pw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_lookup_by_name("p0", &sym) == -1) {
 			mdb_warn("failed to read 'practive'");
 			return (WALK_ERR);
@@ -2763,7 +2763,7 @@ proc_walk_step(mdb_walk_state_t *wsp)
 	if (status != WALK_NEXT)
 		return (status);
 
-	if ((wsp->walk_addr = cld) != NULL) {
+	if ((wsp->walk_addr = cld) != 0) {
 		if (mdb_ctf_vread(&pr, "proc_t", "mdb_walk_proc_t",
 		    cld, 0) == -1) {
 			mdb_warn("proc %p has invalid p_child %p; skipping\n",
@@ -2789,14 +2789,14 @@ sib:
 	if (pw->pw_depth == 0)
 		return (WALK_DONE);
 
-	if (sib != NULL && mdb_ctf_vread(&pr, "proc_t", "mdb_walk_proc_t",
+	if (sib != 0 && mdb_ctf_vread(&pr, "proc_t", "mdb_walk_proc_t",
 	    sib, 0) == -1) {
 		mdb_warn("proc %p has invalid p_sibling %p; skipping\n",
 		    addr, sib);
-		sib = NULL;
+		sib = 0;
 	}
 
-	if ((wsp->walk_addr = sib) == NULL) {
+	if ((wsp->walk_addr = sib) == 0) {
 		if (pw->pw_depth > 0) {
 			wsp->walk_addr = pw->pw_stack[pw->pw_depth - 1];
 			return (WALK_NEXT);
@@ -2858,7 +2858,7 @@ task_walk_step(mdb_walk_state_t *wsp)
 int
 project_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&wsp->walk_addr, "proj0p") == -1) {
 			mdb_warn("failed to read 'proj0p'");
 			return (WALK_ERR);
@@ -2941,7 +2941,7 @@ cpu_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (panicstr != NULL) {
+	if (panicstr != 0) {
 		if (mdb_lookup_by_name("panic_cpu", &sym) == -1) {
 			mdb_warn("failed to find 'panic_cpu'");
 			return (WALK_ERR);
@@ -2976,7 +2976,7 @@ cpu_walk_init(mdb_walk_state_t *wsp)
 			return (WALK_ERR);
 		}
 
-		if (panicstr != NULL && panic_cpu.cpu_id == cpu.cpu_id) {
+		if (panicstr != 0 && panic_cpu.cpu_id == cpu.cpu_id) {
 			cw->cw_array[i++] = addr;
 		} else {
 			cw->cw_array[i++] = current;
@@ -2996,7 +2996,7 @@ cpu_walk_step(mdb_walk_state_t *wsp)
 	cpu_t cpu;
 	uintptr_t addr = cw->cw_array[cw->cw_ndx++];
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&cpu, sizeof (cpu), addr) == -1) {
@@ -3045,7 +3045,7 @@ cpuinfo_walk_ithread(uintptr_t addr, const kthread_t *thr, cpuinfo_data_t *cid)
 		return (WALK_NEXT);
 	}
 
-	if (cid->cid_ithr[id][pil] != NULL) {
+	if (cid->cid_ithr[id][pil] != 0) {
 		mdb_warn("CPU %d has multiple threads at pil %d (at least "
 		    "%p and %p)\n", id, pil, addr, cid->cid_ithr[id][pil]);
 		return (WALK_NEXT);
@@ -3206,7 +3206,7 @@ cpuinfo_walk_cpu(uintptr_t addr, const cpu_t *cpu, cpuinfo_data_t *cid)
 		for (i = NINTR - 1; i >= 0; i--) {
 			uintptr_t iaddr = cid->cid_ithr[cpu->cpu_id][i];
 
-			if (iaddr == NULL)
+			if (iaddr == 0)
 				continue;
 
 			if (!found_one) {
@@ -3236,7 +3236,7 @@ cpuinfo_walk_cpu(uintptr_t addr, const cpu_t *cpu, cpuinfo_data_t *cid)
 			pinned = (uintptr_t)t.t_intr;
 		}
 
-		if (found_one && pinned != NULL) {
+		if (found_one && pinned != 0) {
 			cid->cid_print_head = TRUE;
 			(void) strcpy(p.p_user.u_comm, "?");
 
@@ -3285,7 +3285,7 @@ cpuinfo_walk_cpu(uintptr_t addr, const cpu_t *cpu, cpuinfo_data_t *cid)
 		for (i = npri - 1; i >= 0; i--) {
 			uintptr_t taddr = (uintptr_t)dq[i].dq_first;
 
-			while (taddr != NULL) {
+			while (taddr != 0) {
 				if (mdb_vread(&t, sizeof (t), taddr) == -1) {
 					mdb_warn("failed to read kthread_t "
 					    "at %p", taddr);
@@ -3455,7 +3455,7 @@ ptree_walk(uintptr_t addr, const void *ignored, void *data)
 
 	mdb_ctf_vread(&proc, "proc_t", "mdb_ptree_proc_t", addr, 0);
 
-	for (paddr = (uintptr_t)proc.p_parent; paddr != NULL; ident += 5) {
+	for (paddr = (uintptr_t)proc.p_parent; paddr != 0; ident += 5) {
 		mdb_ctf_vread(&parent, "proc_t", "mdb_ptree_proc_t", paddr, 0);
 		paddr = (uintptr_t)parent.p_parent;
 	}
@@ -3489,7 +3489,7 @@ int
 ptree(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	if (!(flags & DCMD_ADDRSPEC))
-		addr = NULL;
+		addr = 0;
 	else
 		ptree_ancestors(addr, addr);
 
@@ -3705,7 +3705,7 @@ did2thread(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 errorq_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "errorq_list") == -1) {
 		mdb_warn("failed to read errorq_list");
 		return (WALK_ERR);
@@ -3720,7 +3720,7 @@ errorq_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	errorq_t eq;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&eq, sizeof (eq), addr) == -1) {
@@ -3752,7 +3752,7 @@ eqd_push_list(eqd_walk_data_t *eqdp, uintptr_t addr)
 {
 	errorq_elem_t eqe;
 
-	while (addr != NULL) {
+	while (addr != 0) {
 		if (mdb_vread(&eqe, sizeof (eqe), addr) != sizeof (eqe)) {
 			mdb_warn("failed to read errorq element at %p", addr);
 			break;
diff --git a/usr/src/cmd/mdb/common/modules/genunix/group.c b/usr/src/cmd/mdb/common/modules/genunix/group.c
index 6040ba4939..ac50f0297a 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/group.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/group.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Display group information and walk all elements of a group
  */
@@ -160,7 +158,7 @@ group_walk_step(mdb_walk_state_t *wsp)
 	/*
 	 * Print non-NULL elements
 	 */
-	status = wsp->walk_addr == NULL ?
+	status = wsp->walk_addr == 0 ?
 	    WALK_NEXT :
 	    wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
 		wsp->walk_cbdata);
diff --git a/usr/src/cmd/mdb/common/modules/genunix/hotplug.c b/usr/src/cmd/mdb/common/modules/genunix/hotplug.c
index a6a21d4f82..725a44eb7d 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/hotplug.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/hotplug.c
@@ -130,7 +130,7 @@ hotplug(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 		if (mdb_readvar(&devinfo_root, "top_devinfo") == -1) {
 			mdb_warn("failed to read 'top_devinfo'");
-			return (NULL);
+			return (0);
 		}
 
 		data.di_base = devinfo_root;
diff --git a/usr/src/cmd/mdb/common/modules/genunix/kmem.c b/usr/src/cmd/mdb/common/modules/genunix/kmem.c
index 2cf0a10a3f..c615af3c66 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/kmem.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/kmem.c
@@ -116,7 +116,7 @@ kmem_cache_walk_init(mdb_walk_state_t *wsp)
 int
 kmem_cpu_cache_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("kmem_cpu_cache doesn't support global walks");
 		return (WALK_ERR);
 	}
@@ -245,7 +245,7 @@ kmem_slab_walk_init(mdb_walk_state_t *wsp)
 {
 	uintptr_t caddr = wsp->walk_addr;
 
-	if (caddr == NULL) {
+	if (caddr == 0) {
 		mdb_warn("kmem_slab doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -282,7 +282,7 @@ kmem_slab_walk_partial_init(mdb_walk_state_t *wsp)
 	uintptr_t caddr = wsp->walk_addr;
 	kmem_cache_t c;
 
-	if (caddr == NULL) {
+	if (caddr == 0) {
 		mdb_warn("kmem_slab_partial doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -788,7 +788,7 @@ kmem_hash_walk_init(mdb_walk_state_t *wsp)
 	size_t nelems;
 	size_t hsize;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("kmem_hash doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -828,15 +828,15 @@ int
 kmem_hash_walk_step(mdb_walk_state_t *wsp)
 {
 	kmem_hash_walk_t *kmhw = wsp->walk_data;
-	uintptr_t addr = NULL;
+	uintptr_t addr = 0;
 
-	if ((addr = (uintptr_t)kmhw->kmhw_cur.bc_next) == NULL) {
+	if ((addr = (uintptr_t)kmhw->kmhw_cur.bc_next) == 0) {
 		while (kmhw->kmhw_pos < kmhw->kmhw_nelems) {
-			if ((addr = kmhw->kmhw_table[kmhw->kmhw_pos++]) != NULL)
+			if ((addr = kmhw->kmhw_table[kmhw->kmhw_pos++]) != 0)
 				break;
 		}
 	}
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&kmhw->kmhw_cur, sizeof (kmem_bufctl_t), addr) == -1) {
@@ -1162,7 +1162,7 @@ kmem_walk_init_common(mdb_walk_state_t *wsp, int type)
 
 	type &= ~KM_HASH;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("kmem walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1644,7 +1644,7 @@ kmem_walk_init(mdb_walk_state_t *wsp)
 	if (wsp->walk_arg != NULL)
 		wsp->walk_addr = (uintptr_t)wsp->walk_arg;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		KMEM_WALK_ALL("kmem", wsp);
 	return (kmem_walk_init_common(wsp, KM_ALLOCATED));
 }
@@ -1652,7 +1652,7 @@ kmem_walk_init(mdb_walk_state_t *wsp)
 int
 bufctl_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		KMEM_WALK_ALL("bufctl", wsp);
 	return (kmem_walk_init_common(wsp, KM_ALLOCATED | KM_BUFCTL));
 }
@@ -1660,7 +1660,7 @@ bufctl_walk_init(mdb_walk_state_t *wsp)
 int
 freemem_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		KMEM_WALK_ALL("freemem", wsp);
 	return (kmem_walk_init_common(wsp, KM_FREE));
 }
@@ -1668,7 +1668,7 @@ freemem_walk_init(mdb_walk_state_t *wsp)
 int
 freemem_constructed_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		KMEM_WALK_ALL("freemem_constructed", wsp);
 	return (kmem_walk_init_common(wsp, KM_FREE | KM_CONSTRUCTED));
 }
@@ -1676,7 +1676,7 @@ freemem_constructed_walk_init(mdb_walk_state_t *wsp)
 int
 freectl_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		KMEM_WALK_ALL("freectl", wsp);
 	return (kmem_walk_init_common(wsp, KM_FREE | KM_BUFCTL));
 }
@@ -1684,7 +1684,7 @@ freectl_walk_init(mdb_walk_state_t *wsp)
 int
 freectl_constructed_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		KMEM_WALK_ALL("freectl_constructed", wsp);
 	return (kmem_walk_init_common(wsp,
 	    KM_FREE | KM_BUFCTL | KM_CONSTRUCTED));
@@ -1704,7 +1704,7 @@ bufctl_history_walk_init(mdb_walk_state_t *wsp)
 	kmem_bufctl_audit_t bc;
 	kmem_bufctl_audit_t bcn;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("bufctl_history walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1748,7 +1748,7 @@ bufctl_history_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t baseaddr = wsp->walk_addr;
 	kmem_bufctl_audit_t bc;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&bc, sizeof (bc), addr) == -1) {
@@ -1802,12 +1802,12 @@ kmem_log_walk_init(mdb_walk_state_t *wsp)
 	 * By default (global walk), walk the kmem_transaction_log.  Otherwise
 	 * read the log whose kmem_log_header_t is stored at walk_addr.
 	 */
-	if (lp == NULL && mdb_readvar(&lp, "kmem_transaction_log") == -1) {
+	if (lp == 0 && mdb_readvar(&lp, "kmem_transaction_log") == -1) {
 		mdb_warn("failed to read 'kmem_transaction_log'");
 		return (WALK_ERR);
 	}
 
-	if (lp == NULL) {
+	if (lp == 0) {
 		mdb_warn("log is disabled\n");
 		return (WALK_ERR);
 	}
@@ -1948,7 +1948,7 @@ allocdby_walk_init_common(mdb_walk_state_t *wsp, const char *walk)
 {
 	allocdby_walk_t *abw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("allocdby walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -2230,7 +2230,7 @@ whatis_walk_kmem(uintptr_t addr, void *ignored, whatis_info_t *wi)
 	size_t size = wi->wi_cache->cache_bufsize;
 
 	while (mdb_whatis_match(w, addr, size, &cur))
-		whatis_print_kmem(wi, cur, addr, NULL);
+		whatis_print_kmem(wi, cur, addr, 0);
 
 	return (WHATIS_WALKRET(w));
 }
@@ -2717,7 +2717,7 @@ kmem_log(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		return (DCMD_ERR);
 	}
 
-	if (lhp == NULL) {
+	if (lhp == 0) {
 		mdb_warn("no kmem transaction log\n");
 		return (DCMD_ERR);
 	}
@@ -2750,12 +2750,12 @@ kmem_log(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	}
 
 	kmc = mdb_zalloc(sizeof (kmem_log_cpu_t) * NCPU, UM_SLEEP | UM_GC);
-	kmd.kmd_addr = NULL;
+	kmd.kmd_addr = 0;
 	kmd.kmd_cpu = kmc;
 
 	for (i = 0; i < NCPU; i++) {
 
-		if (cpu[i] == NULL)
+		if (cpu[i] == 0)
 			continue;
 
 		if (mdb_vread(&clh, sizeof (clh), clhp) == -1) {
@@ -2856,8 +2856,8 @@ bufctl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	uint_t verbose = FALSE;
 	uint_t history = FALSE;
 	uint_t in_history = FALSE;
-	uintptr_t caller = NULL, thread = NULL;
-	uintptr_t laddr, haddr, baddr = NULL;
+	uintptr_t caller = 0, thread = 0;
+	uintptr_t laddr, haddr, baddr = 0;
 	hrtime_t earliest = 0, latest = 0;
 	int i, depth;
 	char c[MDB_SYM_NAMLEN];
@@ -2936,7 +2936,7 @@ bufctl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	 */
 	depth = MIN(bc.bc_depth, KMEM_STACK_DEPTH);
 
-	if (caller != NULL) {
+	if (caller != 0) {
 		laddr = caller;
 		haddr = caller + sizeof (caller);
 
@@ -2958,7 +2958,7 @@ bufctl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			return (DCMD_OK);
 	}
 
-	if (thread != NULL && (uintptr_t)bc.bc_thread != thread)
+	if (thread != 0 && (uintptr_t)bc.bc_thread != thread)
 		return (DCMD_OK);
 
 	if (earliest != 0 && bc.bc_timestamp < earliest)
@@ -3018,7 +3018,7 @@ typedef struct kmem_verify {
 
 /*
  * verify_pattern()
- * 	verify that buf is filled with the pattern pat.
+ *	verify that buf is filled with the pattern pat.
  */
 static int64_t
 verify_pattern(uint64_t *buf_arg, size_t size, uint64_t pat)
@@ -3045,8 +3045,8 @@ verify_buftag(kmem_buftag_t *btp, uintptr_t pat)
 
 /*
  * verify_free()
- * 	verify the integrity of a free block of memory by checking
- * 	that it is filled with 0xdeadbeef and that its buftag is sane.
+ *	verify the integrity of a free block of memory by checking
+ *	that it is filled with 0xdeadbeef and that its buftag is sane.
  */
 /*ARGSUSED1*/
 static int
@@ -3111,8 +3111,8 @@ corrupt:
 
 /*
  * verify_alloc()
- * 	Verify that the buftag of an allocated buffer makes sense with respect
- * 	to the buffer.
+ *	Verify that the buftag of an allocated buffer makes sense with respect
+ *	to the buffer.
  */
 /*ARGSUSED1*/
 static int
@@ -3324,7 +3324,7 @@ vmem_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	while (vaddr != NULL) {
+	while (vaddr != 0) {
 		vp = mdb_zalloc(sizeof (vmem_node_t), UM_SLEEP);
 		vp->vn_addr = vaddr;
 		vp->vn_next = head;
@@ -3343,7 +3343,7 @@ vmem_walk_init(mdb_walk_state_t *wsp)
 
 	for (vp = head; vp != NULL; vp = vp->vn_next) {
 
-		if ((paddr = (uintptr_t)vp->vn_vmem.vm_source) == NULL) {
+		if ((paddr = (uintptr_t)vp->vn_vmem.vm_source) == 0) {
 			vp->vn_sibling = root;
 			root = vp;
 			continue;
@@ -3492,7 +3492,7 @@ vmem_seg_walk_common_init(mdb_walk_state_t *wsp, uint8_t type, char *name)
 {
 	vmem_seg_walk_t *vsw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("vmem_%s does not support global walks\n", name);
 		return (WALK_ERR);
 	}
@@ -3609,7 +3609,7 @@ vmem(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		return (DCMD_ERR);
 	}
 
-	for (paddr = (uintptr_t)v.vm_source; paddr != NULL; ident += 2) {
+	for (paddr = (uintptr_t)v.vm_source; paddr != 0; ident += 2) {
 		if (mdb_vread(&parent, sizeof (parent), paddr) == -1) {
 			mdb_warn("couldn't trace %p's ancestry", addr);
 			ident = 0;
@@ -3676,7 +3676,7 @@ vmem_seg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	int depth;
 	uintptr_t laddr, haddr;
 
-	uintptr_t caller = NULL, thread = NULL;
+	uintptr_t caller = 0, thread = 0;
 	uintptr_t minsize = 0, maxsize = 0;
 
 	hrtime_t earliest = 0, latest = 0;
@@ -3758,11 +3758,10 @@ vmem_seg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	    (depth == 0 || depth > VMEM_STACK_DEPTH);
 
 	if (no_debug) {
-		if (caller != NULL || thread != NULL || earliest != 0 ||
-		    latest != 0)
+		if (caller != 0 || thread != 0 || earliest != 0 || latest != 0)
 			return (DCMD_OK);		/* not enough info */
 	} else {
-		if (caller != NULL) {
+		if (caller != 0) {
 			laddr = caller;
 			haddr = caller + sizeof (caller);
 
@@ -3786,7 +3785,7 @@ vmem_seg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 				return (DCMD_OK);
 		}
 
-		if (thread != NULL && (uintptr_t)vs.vs_thread != thread)
+		if (thread != 0 && (uintptr_t)vs.vs_thread != thread)
 			return (DCMD_OK);
 
 		if (earliest != 0 && vs.vs_timestamp < earliest)
@@ -3909,7 +3908,7 @@ kmalog(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	if (flags & DCMD_ADDRSPEC)
 		kma.kma_addr = addr;
 	else
-		kma.kma_addr = NULL;
+		kma.kma_addr = 0;
 
 	if (argc > 0) {
 		if (argv->a_type != MDB_TYPE_STRING)
@@ -4195,7 +4194,7 @@ kmausers(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		opt_f = TRUE;
 		kmu.kmu_addr = addr;
 	} else {
-		kmu.kmu_addr = NULL;
+		kmu.kmu_addr = 0;
 	}
 
 	if (opt_e)
diff --git a/usr/src/cmd/mdb/common/modules/genunix/ldi.c b/usr/src/cmd/mdb/common/modules/genunix/ldi.c
index 88f0e5584c..1df7fd1120 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/ldi.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/ldi.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/sysmacros.h>
 #include <sys/dditypes.h>
@@ -44,9 +42,9 @@
  * ldi handle walker structure
  */
 typedef struct lh_walk {
-	struct ldi_handle	**hash;	/* current bucket pointer 	*/
+	struct ldi_handle	**hash;	/* current bucket pointer	*/
 	struct ldi_handle	*lhp;	/* ldi handle pointer		*/
-	size_t 			index;	/* hash table index		*/
+	size_t			index;	/* hash table index		*/
 	struct ldi_handle	buf;	/* buffer used for handle reads */
 } lh_walk_t;
 
@@ -54,9 +52,9 @@ typedef struct lh_walk {
  * ldi identifier walker structure
  */
 typedef struct li_walk {
-	struct ldi_ident	**hash;	/* current bucket pointer 	*/
+	struct ldi_ident	**hash;	/* current bucket pointer	*/
 	struct ldi_ident	*lip;	/* ldi handle pointer		*/
-	size_t 			index;	/* hash table index		*/
+	size_t			index;	/* hash table index		*/
 	struct ldi_ident	buf;	/* buffer used for ident reads */
 } li_walk_t;
 
@@ -100,11 +98,11 @@ ldi_handle_walk_init(mdb_walk_state_t *wsp)
 int
 ldi_handle_walk_step(mdb_walk_state_t *wsp)
 {
-	lh_walk_t 	*lhwp = (lh_walk_t *)wsp->walk_data;
+	lh_walk_t	*lhwp = (lh_walk_t *)wsp->walk_data;
 	int		status;
 
 	/* check if we need to go to the next hash bucket */
-	while (wsp->walk_addr == NULL) {
+	while (wsp->walk_addr == 0) {
 
 		/* advance to the next bucket */
 		if (++(lhwp->index) >= LH_HASH_SZ)
@@ -168,11 +166,11 @@ ldi_ident_walk_init(mdb_walk_state_t *wsp)
 int
 ldi_ident_walk_step(mdb_walk_state_t *wsp)
 {
-	li_walk_t 	*liwp = (li_walk_t *)wsp->walk_data;
+	li_walk_t	*liwp = (li_walk_t *)wsp->walk_data;
 	int		status;
 
 	/* check if we need to go to the next hash bucket */
-	while (wsp->walk_addr == NULL) {
+	while (wsp->walk_addr == 0) {
 
 		/* advance to the next bucket */
 		if (++(liwp->index) >= LI_HASH_SZ)
diff --git a/usr/src/cmd/mdb/common/modules/genunix/leaky.c b/usr/src/cmd/mdb/common/modules/genunix/leaky.c
index 187c132b76..5a73ca5ec0 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/leaky.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/leaky.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * A generic memory leak detector.  The target interface, defined in
  * <leaky_impl.h>, is implemented by the genunix and libumem dmods to fill
@@ -250,7 +248,7 @@ leaky_grep(uintptr_t addr, size_t size)
 	size_t base_size;
 	const uintptr_t mask = sizeof (uintptr_t) - 1;
 
-	if (addr == NULL || size == 0)
+	if (addr == 0 || size == 0)
 		return;
 
 	state_idx = 0;
@@ -666,7 +664,7 @@ leaky_filter(const leak_pc_t *stack, int depth, uintptr_t filter)
 	GElf_Sym sym;
 	char c;
 
-	if (filter == NULL)
+	if (filter == 0)
 		return (1);
 
 	for (i = 0; i < depth; i++) {
@@ -712,7 +710,7 @@ leaky_dump(uintptr_t filter, uint_t dump_verbose)
 	}
 
 	if (!seen) {
-		if (filter != NULL)
+		if (filter != 0)
 			mdb_printf(
 			    "findleaks: no memory leaks matching %a found\n",
 			    filter);
@@ -780,7 +778,7 @@ findleaks(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	leak_ndx_t i;
 	leak_mtab_t *lmp;
 	ssize_t total;
-	uintptr_t filter = NULL;
+	uintptr_t filter = 0;
 	uint_t dump = 0;
 	uint_t force = 0;
 	uint_t verbose = 0;
@@ -901,7 +899,7 @@ leaky_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		lkb = NULL;
 		goto found;
 	}
diff --git a/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c b/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c
index 3606389e35..4f69c2f7bf 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/leaky_subr.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_param.h>
 #include <mdb/mdb_modapi.h>
 
@@ -393,7 +391,7 @@ leaky_subr_estimate(size_t *estp)
 		return (DCMD_ERR);
 	}
 
-	if (state != MDB_STATE_STOPPED && panicstr == NULL) {
+	if (state != MDB_STATE_STOPPED && panicstr == 0) {
 		mdb_warn("findleaks: cannot be run on a live dump.\n");
 		return (DCMD_ERR);
 	}
@@ -464,7 +462,7 @@ leaky_subr_run(void)
 	 * If kmdb is loaded, we need to walk it's module list, since kmdb
 	 * modctl structures can reference kmem allocations.
 	 */
-	if ((mdb_readvar(&dmods, "kdi_dmods") != -1) && (dmods != NULL))
+	if ((mdb_readvar(&dmods, "kdi_dmods") != -1) && (dmods != 0))
 		(void) mdb_pwalk("modctl", (mdb_walk_cb_t)leaky_modctl,
 		    NULL, dmods);
 
diff --git a/usr/src/cmd/mdb/common/modules/genunix/lgrp.c b/usr/src/cmd/mdb/common/modules/genunix/lgrp.c
index b79a4ef755..aa798bdb00 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/lgrp.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/lgrp.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "lgrp.h"
 
 #include <mdb/mdb_modapi.h>
@@ -93,8 +91,8 @@ print_cpuset_range(ulong_t *cs, int words, int width)
 		mdb_printf("%*s", width - count, "");
 }
 typedef struct lgrp_cpu_walk {
-	uintptr_t 	lcw_firstcpu;
-	int 		lcw_cpusleft;
+	uintptr_t	lcw_firstcpu;
+	int		lcw_cpusleft;
 } lgrp_cpu_walk_t;
 
 int
@@ -143,7 +141,7 @@ lgrp_cpulist_walk_step(mdb_walk_state_t *wsp)
 	addr = (uintptr_t)cpu.cpu_next_lgrp;
 	wsp->walk_addr = addr;
 
-	if (lcw->lcw_cpusleft == NULL && addr != lcw->lcw_firstcpu) {
+	if (lcw->lcw_cpusleft == 0 && addr != lcw->lcw_firstcpu) {
 		mdb_warn("number of cpus in lgroup cpu != lgroup cpucnt\n");
 		return (WALK_ERR);
 	}
@@ -480,7 +478,7 @@ lgrp_walk_step_common(mdb_walk_state_t *wsp)
 {
 	lgrp_t lgrp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&lgrp, sizeof (lgrp_t), wsp->walk_addr) == -1) {
@@ -509,7 +507,7 @@ lgrp_walk_step(mdb_walk_state_t *wsp)
 		} else {
 			wsp->walk_addr = lwd->lwd_lgrp_tbl[lwd->lwd_iter];
 
-			if (wsp->walk_addr == NULL) {
+			if (wsp->walk_addr == 0) {
 				mdb_warn("NULL lgrp pointer in lgrp_table[%d]",
 				    lwd->lwd_iter);
 				return (WALK_ERR);
@@ -540,7 +538,7 @@ lgrp_parents_walk_step(mdb_walk_state_t *wsp)
 	lgrp_t lgrp;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&lgrp, sizeof (struct lgrp), wsp->walk_addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/list.c b/usr/src/cmd/mdb/common/modules/genunix/list.c
index 1a04d83e37..6923da7b38 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/list.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/list.c
@@ -85,12 +85,12 @@ list_walk_init_range(mdb_walk_state_t *wsp, uintptr_t begin, uintptr_t end,
 	lwd->lw_offset = list.list_offset;
 	lwd->lw_obj = mdb_alloc(list.list_size, UM_SLEEP);
 	lwd->lw_head = (uintptr_t)&((list_t *)wsp->walk_addr)->list_head;
-	lwd->lw_end = (end == NULL ? NULL : end + lwd->lw_offset);
+	lwd->lw_end = (end == 0 ? 0 : end + lwd->lw_offset);
 	lwd->lw_elem_name = element_name;
 	lwd->lw_elem_check = element_check;
 	lwd->lw_elem_check_arg = arg;
 
-	wsp->walk_addr = (begin == NULL
+	wsp->walk_addr = (begin == 0
 	    ? (uintptr_t)list.list_head.list_next
 	    : begin + lwd->lw_offset);
 	wsp->walk_data = lwd;
@@ -101,14 +101,14 @@ list_walk_init_range(mdb_walk_state_t *wsp, uintptr_t begin, uintptr_t end,
 int
 list_walk_init(mdb_walk_state_t *wsp)
 {
-	return (list_walk_init_range(wsp, NULL, NULL, NULL, NULL, NULL, NULL));
+	return (list_walk_init_range(wsp, 0, 0, NULL, NULL, NULL, NULL));
 }
 
 int
 list_walk_init_named(mdb_walk_state_t *wsp,
     const char *list_name, const char *element_name)
 {
-	return (list_walk_init_range(wsp, NULL, NULL, list_name, element_name,
+	return (list_walk_init_range(wsp, 0, 0, list_name, element_name,
 	    NULL, NULL));
 }
 
@@ -117,7 +117,7 @@ list_walk_init_checked(mdb_walk_state_t *wsp,
     const char *list_name, const char *element_name,
     int (*element_check)(void *, uintptr_t, void *), void *arg)
 {
-	return (list_walk_init_range(wsp, NULL, NULL, list_name, element_name,
+	return (list_walk_init_range(wsp, 0, 0, list_name, element_name,
 	    element_check, arg));
 }
 
@@ -132,7 +132,7 @@ list_walk_step(mdb_walk_state_t *wsp)
 	if (wsp->walk_addr == lwd->lw_head)
 		return (WALK_DONE);
 
-	if (lwd->lw_end != NULL && wsp->walk_addr == lwd->lw_end)
+	if (lwd->lw_end != 0 && wsp->walk_addr == lwd->lw_end)
 		return (WALK_DONE);
 
 	if (mdb_vread(lwd->lw_obj, lwd->lw_size, addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/mdi.c b/usr/src/cmd/mdb/common/modules/genunix/mdi.c
index 2e6c06684f..81067a7dd6 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/mdi.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/mdi.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/time.h>
@@ -306,7 +304,7 @@ mdivhci(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 mdi_pi_client_link_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Address is required");
 		return (WALK_ERR);
 	}
@@ -319,14 +317,14 @@ mdi_pi_client_link_walk_init(mdb_walk_state_t *wsp)
 int
 mdi_pi_client_link_walk_step(mdb_walk_state_t *wsp)
 {
-	int 		status = 0;
+	int		status = 0;
 	static int	counts = 0;
 
 	if (firstaddr == wsp->walk_addr && counts != 0) {
 		counts = 0;
 		return (WALK_DONE);
 	}
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		counts = 0;
 		return (WALK_DONE);
 	}
@@ -376,7 +374,7 @@ mdiclient_paths(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 mdi_pi_phci_link_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Address is required");
 		return (WALK_ERR);
 	}
@@ -395,7 +393,7 @@ mdi_pi_phci_link_walk_step(mdb_walk_state_t *wsp)
 		counts = 0;
 		return (WALK_DONE);
 	}
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		counts = 0;
 		return (WALK_DONE);
 	}
@@ -443,7 +441,7 @@ mdiphci_paths(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 mdi_phci_ph_next_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Address is required");
 		return (WALK_ERR);
 	}
@@ -462,7 +460,7 @@ mdi_phci_ph_next_walk_step(mdb_walk_state_t *wsp)
 		counts = 0;
 		return (WALK_DONE);
 	}
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		counts = 0;
 		return (WALK_DONE);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/genunix/memory.c b/usr/src/cmd/mdb/common/modules/genunix/memory.c
index fa4918b9b8..3f0802f0a5 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/memory.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/memory.c
@@ -83,7 +83,7 @@ page_walk_init(mdb_walk_state_t *wsp)
 	size_t	hashsz;
 	vnode_t	vn;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 
 		/*
 		 * Walk all pages
@@ -157,7 +157,7 @@ page_walk_step(mdb_walk_state_t *wsp)
 		 * back around to the first one (we finished), or we
 		 * can't read the page we're looking at, we are done.
 		 */
-		if (pp == NULL || pp == pwd->pw_first)
+		if (pp == 0 || pp == pwd->pw_first)
 			return (WALK_DONE);
 		if (mdb_vread(&page, sizeof (page_t), pp) == -1) {
 			mdb_warn("unable to read page_t at %#lx", pp);
@@ -170,7 +170,7 @@ page_walk_step(mdb_walk_state_t *wsp)
 		 * first page), set it.
 		 */
 		wsp->walk_addr = (uintptr_t)page.p_vpnext;
-		if (pwd->pw_first == NULL)
+		if (pwd->pw_first == 0)
 			pwd->pw_first = pp;
 
 	} else if (pwd->pw_hashleft > 0) {
@@ -181,7 +181,7 @@ page_walk_step(mdb_walk_state_t *wsp)
 		 * If pp (the walk address) is NULL, we scan through
 		 * the page hash table until we find a page.
 		 */
-		if (pp == NULL) {
+		if (pp == 0) {
 
 			/*
 			 * Iterate through the page hash table until we
@@ -196,12 +196,12 @@ page_walk_step(mdb_walk_state_t *wsp)
 				}
 				pwd->pw_hashleft--;
 				pwd->pw_hashloc++;
-			} while (pwd->pw_hashleft && (pp == NULL));
+			} while (pwd->pw_hashleft && (pp == 0));
 
 			/*
 			 * We've reached the end; exit.
 			 */
-			if (pp == NULL)
+			if (pp == 0)
 				return (WALK_DONE);
 		}
 
@@ -812,7 +812,7 @@ swap_walk_step(mdb_walk_state_t *wsp)
 
 	sip = wsp->walk_addr;
 
-	if (sip == NULL)
+	if (sip == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&si, sizeof (struct swapinfo), sip) == -1) {
@@ -867,7 +867,7 @@ memlist_walk_step(mdb_walk_state_t *wsp)
 
 	mlp = wsp->walk_addr;
 
-	if (mlp == NULL)
+	if (mlp == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&ml, sizeof (struct memlist), mlp) == -1) {
@@ -908,7 +908,7 @@ memlist(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			if (!(list & 1))
 				continue;
 			if ((mdb_readvar(&ptr, lists[i]) == -1) ||
-			    (ptr == NULL)) {
+			    (ptr == 0)) {
 				mdb_warn("%s not found or invalid", lists[i]);
 				return (DCMD_ERR);
 			}
@@ -939,7 +939,7 @@ memlist(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 seg_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("seg walk must begin at struct as *\n");
 		return (WALK_ERR);
 	}
@@ -1137,7 +1137,7 @@ anon_walk_init_common(mdb_walk_state_t *wsp, ulong_t minslot, ulong_t maxslot)
 {
 	anon_walk_data_t *aw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("anon walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1223,7 +1223,7 @@ anon_walk_step(mdb_walk_state_t *wsp)
 
 			levtwoptr = (uintptr_t)aw->aw_levone[aw->aw_levone_ndx];
 
-			if (levtwoptr == NULL) {
+			if (levtwoptr == 0) {
 				if (!aw->aw_all) {
 					aw->aw_levtwo_ndx = 0;
 					aw->aw_levone_ndx++;
@@ -1258,12 +1258,12 @@ anon_walk_step(mdb_walk_state_t *wsp)
 		}
 	}
 
-	if (anonptr != NULL) {
+	if (anonptr != 0) {
 		mdb_vread(&anon, sizeof (anon), anonptr);
 		return (wsp->walk_callback(anonptr, &anon, wsp->walk_cbdata));
 	}
 	if (aw->aw_all) {
-		return (wsp->walk_callback(NULL, NULL, wsp->walk_cbdata));
+		return (wsp->walk_callback(0, NULL, wsp->walk_cbdata));
 	}
 	return (WALK_NEXT);
 }
@@ -1296,7 +1296,7 @@ segvn_anon_walk_init(mdb_walk_state_t *wsp)
 	struct anon_map		amp;
 	struct seg		seg;
 
-	if (svd_addr == NULL) {
+	if (svd_addr == 0) {
 		mdb_warn("segvn_anon walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1405,7 +1405,7 @@ segvn_pages_walk_init(mdb_walk_state_t *wsp)
 	segvn_walk_data_t	*svw;
 	struct segvn_data	*svd;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("segvn walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1514,7 +1514,7 @@ segvn_pages_walk_step(mdb_walk_state_t *wsp)
 		u_offset_t off;
 
 		if (svw->svw_sparse_idx >= svw->svw_sparse_count) {
-			pp = NULL;
+			pp = 0;
 			if (!svw->svw_all) {
 				return (WALK_DONE);
 			}
@@ -1523,14 +1523,14 @@ segvn_pages_walk_step(mdb_walk_state_t *wsp)
 			    &svw->svw_sparse[svw->svw_sparse_idx];
 			off = svs->svs_offset - svd->offset;
 			if (svw->svw_all && svw->svw_walkoff != off) {
-				pp = NULL;
+				pp = 0;
 			} else {
 				pp = svs->svs_page;
 				svw->svw_sparse_idx++;
 			}
 		}
 
-	} else if (svd->amp == NULL || wsp->walk_addr == NULL) {
+	} else if (svd->amp == NULL || wsp->walk_addr == 0) {
 		/*
 		 * If there's no anon, or the anon slot is NULL, look up
 		 * <vp, offset>.
@@ -1539,7 +1539,7 @@ segvn_pages_walk_step(mdb_walk_state_t *wsp)
 			pp = mdb_page_lookup((uintptr_t)svd->vp,
 			    svd->offset + svw->svw_walkoff);
 		} else {
-			pp = NULL;
+			pp = 0;
 		}
 
 	} else {
@@ -1563,12 +1563,12 @@ segvn_pages_walk_step(mdb_walk_state_t *wsp)
 				mdb_warn("walk segvn_pages: useless struct "
 				    "anon at %p\n", wsp->walk_addr);
 			}
-			pp = NULL;	/* nothing at this offset */
+			pp = 0;	/* nothing at this offset */
 		}
 	}
 
 	svw->svw_walkoff += PAGESIZE;	/* Update for the next call */
-	if (pp != NULL) {
+	if (pp != 0) {
 		if (mdb_vread(&page, sizeof (page_t), pp) == -1) {
 			mdb_warn("unable to read page_t at %#lx", pp);
 			return (WALK_ERR);
@@ -1576,7 +1576,7 @@ segvn_pages_walk_step(mdb_walk_state_t *wsp)
 		return (wsp->walk_callback(pp, &page, wsp->walk_cbdata));
 	}
 	if (svw->svw_all) {
-		return (wsp->walk_callback(NULL, NULL, wsp->walk_cbdata));
+		return (wsp->walk_callback(0, NULL, wsp->walk_cbdata));
 	}
 	return (WALK_NEXT);
 }
@@ -1671,7 +1671,7 @@ vnode2smap(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		}
 
 		saddr = (uintptr_t)smp.sm_hash;
-	} while (saddr != NULL);
+	} while (saddr != 0);
 
 	mdb_printf("no smap for vnode %p, offs %p\n", addr, offset);
 	return (DCMD_OK);
diff --git a/usr/src/cmd/mdb/common/modules/genunix/mmd.c b/usr/src/cmd/mdb/common/modules/genunix/mmd.c
index 358608b74d..119d51d122 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/mmd.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/mmd.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Multidata dcmds and walkers, part of the genunix mdb module,
  * and operate on core Multidata structures.
@@ -503,7 +501,7 @@ mmdq_walk_init(mdb_walk_state_t *wsp, char *name, uintptr_t qh,
 	ql_t ql;
 
 	/* Caller must have supplied an address */
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	qwp = mdb_alloc(sizeof (*qwp), UM_SLEEP);
@@ -590,7 +588,7 @@ pdesc_slab_walk_init(mdb_walk_state_t *wsp)
 {
 	uintptr_t q_head;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	/*
@@ -649,7 +647,7 @@ pdesc_walk_init(mdb_walk_state_t *wsp)
 {
 	uintptr_t q_head;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	/*
@@ -817,7 +815,7 @@ pattr_walk_init(mdb_walk_state_t *wsp)
 {
 	uintptr_t q_head;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	/*
diff --git a/usr/src/cmd/mdb/common/modules/genunix/modhash.c b/usr/src/cmd/mdb/common/modules/genunix/modhash.c
index b5c207de36..37890022dd 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/modhash.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/modhash.c
@@ -25,8 +25,6 @@
  * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <string.h>
 #include <sys/modhash_impl.h>
 
@@ -119,7 +117,7 @@ modhash_walk_step(mdb_walk_state_t *wsp)
 	mod_hash_t mh;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&mh, sizeof (mh), wsp->walk_addr) == -1) {
@@ -144,7 +142,7 @@ modent_walk_init(mdb_walk_state_t *wsp)
 	hash_walk_t *hwp;
 	int retv;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("mod_hash_t address required\n");
 		return (WALK_ERR);
 	}
@@ -187,9 +185,9 @@ modent_walk_init(mdb_walk_state_t *wsp)
 
 	hwp->hwalk_msd.msd_hash_index = -1;
 	hwp->hwalk_msd.msd_position = 0;
-	hwp->hwalk_msd.msd_first_addr = NULL;
+	hwp->hwalk_msd.msd_first_addr = 0;
 
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = 0;
 	wsp->walk_data = hwp;
 
 	return (WALK_NEXT);
@@ -204,7 +202,7 @@ modent_walk_step(mdb_walk_state_t *wsp)
 	hash_walk_t *hwp = wsp->walk_data;
 	int status;
 
-	while (wsp->walk_addr == NULL) {
+	while (wsp->walk_addr == 0) {
 		hwp->hwalk_msd.msd_position = 0;
 		if (++hwp->hwalk_msd.msd_hash_index >=
 		    hwp->hwalk_hash.mh_nchains)
@@ -251,7 +249,7 @@ modchain_walk_step(mdb_walk_state_t *wsp)
 	struct mod_hash_entry mhe;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&mhe, sizeof (mhe), wsp->walk_addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/net.c b/usr/src/cmd/mdb/common/modules/genunix/net.c
index 6cae10c858..f29407b76a 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/net.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/net.c
@@ -210,7 +210,7 @@ net_udp_ipv6(const udp_t *udp)
 int
 sonode_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		GElf_Sym sym;
 		struct socklist *slp;
 
@@ -239,7 +239,7 @@ sonode_walk_step(mdb_walk_state_t *wsp)
 	int status;
 	struct sotpi_sonode *stp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct sotpi_sonode),
@@ -273,7 +273,7 @@ mi_walk_init(mdb_walk_state_t *wsp)
 {
 	struct mi_walk_data *wdp;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("mi doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -281,7 +281,7 @@ mi_walk_init(mdb_walk_state_t *wsp)
 	wdp = mdb_alloc(sizeof (struct mi_walk_data), UM_SLEEP);
 
 	/* So that we do not immediately return WALK_DONE below */
-	wdp->mi_wd_miofirst = NULL;
+	wdp->mi_wd_miofirst = 0;
 
 	wsp->walk_data = wdp;
 	return (WALK_NEXT);
@@ -306,7 +306,7 @@ mi_walk_step(mdb_walk_state_t *wsp)
 	}
 
 	/* Only true in the first iteration */
-	if (wdp->mi_wd_miofirst == NULL) {
+	if (wdp->mi_wd_miofirst == 0) {
 		wdp->mi_wd_miofirst = wsp->walk_addr;
 		status = WALK_NEXT;
 	} else {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/netstack.c b/usr/src/cmd/mdb/common/modules/genunix/netstack.c
index d46bd85d1f..305ff3d06c 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/netstack.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/netstack.c
@@ -56,7 +56,7 @@ netstack_walk_step(mdb_walk_state_t *wsp)
 	int status;
 	netstack_t nss;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&nss, sizeof (netstack_t), wsp->walk_addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/nvpair.c b/usr/src/cmd/mdb/common/modules/genunix/nvpair.c
index 3d18c2fd28..a284bbccc2 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/nvpair.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/nvpair.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/sysinfo.h>
 #include <sys/nvpair.h>
 #include <sys/nvpair_impl.h>
@@ -47,7 +45,7 @@ nvpair_walk_init(mdb_walk_state_t *wsp)
 	nvpriv_t nvpriv;
 	i_nvp_t *tmp;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("nvpair does not support global walks\n");
 		return (WALK_ERR);
 	}
@@ -74,7 +72,7 @@ nvpair_walk_step(mdb_walk_state_t *wsp)
 	nvpair_t *nvpair;
 	i_nvp_t i_nvp, *tmp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&i_nvp, sizeof (i_nvp), wsp->walk_addr) == -1) {
@@ -123,8 +121,8 @@ print_nvlist(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 /*
  * ::nvpair [-rq]
  *
- * 	-r	Recursively print any nvlist elements
- * 	-q	Quiet mode; print members only as "name=value"
+ *	-r	Recursively print any nvlist elements
+ *	-q	Quiet mode; print members only as "name=value"
  *
  * Prints out a single nvpair.  By default, all information is printed.  When
  * given the '-q' option, the type of elements is hidden, and elements are
@@ -159,7 +157,7 @@ nvpair_info_t nvpair_info[] =  {
 	{ DATA_TYPE_UINT16_ARRAY,	2, "uint16_array" },
 	{ DATA_TYPE_INT32_ARRAY,	4, "int32_array" },
 	{ DATA_TYPE_UINT32_ARRAY,	4, "uint32_array" },
-	{ DATA_TYPE_INT64_ARRAY, 	8, "int64_array" },
+	{ DATA_TYPE_INT64_ARRAY,	8, "int64_array" },
 	{ DATA_TYPE_UINT64_ARRAY,	8, "uint64_array" },
 	{ DATA_TYPE_STRING_ARRAY,	0, "string_array" },
 	{ DATA_TYPE_NVLIST_ARRAY,	0, "nvpair list_array" }
diff --git a/usr/src/cmd/mdb/common/modules/genunix/rctl.c b/usr/src/cmd/mdb/common/modules/genunix/rctl.c
index 4929157d42..760bdf7b5f 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/rctl.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/rctl.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_modapi.h>
 #include <sys/rctl.h>
 #include <sys/proc.h>
@@ -204,7 +202,7 @@ rctl_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	dict_data_t rdict;
 	int i;
 
-	rdict.dict_addr = NULL;
+	rdict.dict_addr = 0;
 
 	if (!(flags & DCMD_ADDRSPEC))
 		return (DCMD_USAGE);
@@ -230,7 +228,7 @@ rctl_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			return (DCMD_ERR);
 		}
 		/* Couldn't find a rctl_dict_entry_t for this handle */
-		if (rdict.dict_addr == NULL)
+		if (rdict.dict_addr == 0)
 			return (DCMD_ERR);
 	} else
 		return (DCMD_USAGE);
@@ -337,7 +335,7 @@ rctl_dict_walk_step(mdb_walk_state_t *wsp)
 
 	dp = (uintptr_t)((dwd->curdict)[dwd->num_cur]);
 
-	while (dp != NULL) {
+	while (dp != 0) {
 		if (mdb_vread(&entry, sizeof (rctl_dict_entry_t), dp) == -1) {
 			mdb_warn("failed to read rctl_dict_entry_t structure "
 			    "at %p", dp);
@@ -422,7 +420,7 @@ rctl_set_walk_step(mdb_walk_state_t *wsp)
 	if (swd->hashcur >= swd->hashsize)
 		return (WALK_DONE);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		while (swd->hashcur < swd->hashsize) {
 			if (rhash[swd->hashcur] != NULL) {
 				break;
@@ -439,7 +437,7 @@ rctl_set_walk_step(mdb_walk_state_t *wsp)
 	}
 
 	if (mdb_vread(&rctl, sizeof (rctl_t), wsp->walk_addr) == -1) {
-		wsp->walk_addr = NULL;
+		wsp->walk_addr = 0;
 		mdb_warn("unable to read from %#p", wsp->walk_addr);
 		return (WALK_ERR);
 	}
@@ -487,7 +485,7 @@ rctl_val_walk_step(mdb_walk_state_t *wsp)
 
 	status = wsp->walk_callback(wsp->walk_addr, &val, wsp->walk_cbdata);
 
-	if ((wsp->walk_addr = (uintptr_t)val.rcv_next) == NULL)
+	if ((wsp->walk_addr = (uintptr_t)val.rcv_next) == 0)
 		return (WALK_DONE);
 
 	return (status);
diff --git a/usr/src/cmd/mdb/common/modules/genunix/sobj.c b/usr/src/cmd/mdb/common/modules/genunix/sobj.c
index 8c47592ad8..85276f5ceb 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/sobj.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/sobj.c
@@ -148,7 +148,7 @@ wchan_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if ((ww->ww_compare = wsp->walk_addr) == NULL) {
+	if ((ww->ww_compare = wsp->walk_addr) == 0) {
 		if (mdb_readvar(&ww->ww_seen_size, "nthread") == -1) {
 			mdb_warn("failed to read nthread");
 			mdb_free(ww, sizeof (wchan_walk_data_t));
@@ -180,7 +180,7 @@ again:
 	 * sleepq hash.  If ww_compare is set, ww_sleepq_ndx is already
 	 * set to the appropriate sleepq index for the desired cv.
 	 */
-	for (t = ww->ww_thr; t == NULL; ) {
+	for (t = ww->ww_thr; t == 0; ) {
 		if (ww->ww_sleepq_ndx == NSLEEPQ)
 			return (WALK_DONE);
 
@@ -191,7 +191,7 @@ again:
 		 * If we were looking for a specific cv and we're at the end
 		 * of its sleepq, we're done walking.
 		 */
-		if (t == NULL && ww->ww_compare != NULL)
+		if (t == 0 && ww->ww_compare != 0)
 			return (WALK_DONE);
 	}
 
@@ -207,7 +207,7 @@ again:
 	}
 
 	if (thr.t_wchan == NULL) {
-		ww->ww_thr = NULL;
+		ww->ww_thr = 0;
 		goto again;
 	}
 
@@ -220,11 +220,11 @@ again:
 	 * If we're walking a specific cv, invoke the callback if we've
 	 * found a match, or loop back to the top and read the next thread.
 	 */
-	if (ww->ww_compare != NULL) {
+	if (ww->ww_compare != 0) {
 		if (ww->ww_compare == (uintptr_t)thr.t_wchan)
 			return (wsp->walk_callback(t, &thr, wsp->walk_cbdata));
 
-		if (ww->ww_thr == NULL)
+		if (ww->ww_thr == 0)
 			return (WALK_DONE);
 
 		goto again;
@@ -245,7 +245,7 @@ again:
 	 * If we hit seen_size this is a live kernel and nthread is now larger,
 	 * cope by replacing the final element in our memory.
 	 */
-	if (ww->ww_thr != NULL) {
+	if (ww->ww_thr != 0) {
 		if (ww->ww_seen_ndx < ww->ww_seen_size)
 			ww->ww_seen[ww->ww_seen_ndx++] = thr.t_wchan;
 		else
@@ -365,7 +365,7 @@ blocked_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = 0;
 
 	if (mdb_layered_walk("thread", wsp) == -1) {
 		mdb_warn("couldn't walk 'thread'");
@@ -494,7 +494,7 @@ rwlock(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	rwlock_block_t *rw = NULL;
 	uintptr_t wwwh;
 
-	if (!(flags & DCMD_ADDRSPEC) || addr == NULL || argc != 0)
+	if (!(flags & DCMD_ADDRSPEC) || addr == 0 || argc != 0)
 		return (DCMD_USAGE);
 
 	if (mdb_vread(&lock, sizeof (lock), addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/streams.c b/usr/src/cmd/mdb/common/modules/genunix/streams.c
index d0095c7752..245fca6070 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/streams.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/streams.c
@@ -51,7 +51,7 @@ typedef struct str_types {
 
 typedef struct ftblk_data {
 	ftblk_t ft_data;	/* Copy of ftblk */
-	int 	ft_ix;		/* Index in event list */
+	int	ft_ix;		/* Index in event list */
 	boolean_t ft_in_evlist;	/* Iterating through evlist */
 } ftblkdata_t;
 
@@ -64,7 +64,7 @@ typedef void sdprint_func(stdata_t *, stdata_t *);
  * Queue flags
  */
 static const strflags_t qf[] = {
-	{ SF(QENAB), 		"Queue is already enabled to run"	},
+	{ SF(QENAB),		"Queue is already enabled to run"	},
 	{ SF(QWANTR),		"Someone wants to read Q"		},
 	{ SF(QWANTW),		"Someone wants to write Q"		},
 	{ SF(QFULL),		"Q is considered full"			},
@@ -83,7 +83,7 @@ static const strflags_t qf[] = {
 	{ SF(QINSERVICE),	"service routine executing"		},
 	{ SF(QWCLOSE),		"will not be enabled"			},
 	{ SF(QEND),		"last queue in stream"			},
-	{ SF(QWANTWSYNC),	"Streamhead wants to write Q" 		},
+	{ SF(QWANTWSYNC),	"Streamhead wants to write Q"		},
 	{ SF(QSYNCSTR),		"Q supports Synchronous STREAMS"	},
 	{ SF(QISDRV),		"the Queue is attached to a driver"	},
 	{ SF(0x00400000),	"unused (was QHOT)"			},
@@ -158,7 +158,7 @@ static const struct str_flags stdf[] = {
 	{ SF(STRATMARK),	"at mark (due to MSGMARKNEXT)"		},
 	{ SF(STZCNOTIFY),	"wait for zerocopy mblk to be acked"	},
 	{ SF(STRPLUMB),		"stream plumbing changes in progress"	},
-	{ SF(STREOF),  		"End-of-file indication"		},
+	{ SF(STREOF),		"End-of-file indication"		},
 	{ SF(STREOPENFAIL),	"re-open has failed"			},
 	{ SF(STRMATE),		"this stream is a mate"			},
 	{ SF(STRHASLINKS),	"there are I_LINKs under this stream"	},
@@ -166,11 +166,11 @@ static const struct str_flags stdf[] = {
 };
 
 static const struct str_flags mbf[] = {
-	{ SF(MSGMARK), 		"last byte of message is marked"	},
+	{ SF(MSGMARK),		"last byte of message is marked"	},
 	{ SF(MSGNOLOOP),	"don't loop message to write side"	},
 	{ SF(MSGDELIM),		"message is delimited"			},
 	{ SF(0x08),		"unused"				},
-	{ SF(MSGMARKNEXT), 	"Private: b_next's first byte marked"	},
+	{ SF(MSGMARKNEXT),	"Private: b_next's first byte marked"	},
 	{ SF(MSGNOTMARKNEXT),	"Private: ... not marked"		},
 	{ 0, NULL,		NULL					}
 };
@@ -209,7 +209,7 @@ static const strtypes_t mbt[] = {
 	{ "M_PCEVENT",	M_PCEVENT,	"Obsoleted: do not use"		},
 	{ "M_UNHANGUP",	M_UNHANGUP,	"line reconnect"		},
 	{ "M_CMD",	M_CMD,		"out-of-band ioctl command"	},
-	{ NULL,		0,		NULL 				}
+	{ NULL,		0,		NULL				}
 };
 
 /* Allocation flow trace events, starting from 0 */
@@ -243,7 +243,7 @@ static const char *ftev_proc[] = {
 /* 109 */	"putbq",
 /* 10A */	"flushq",
 /* 10B */	"0x10b",
-/* 10C */ 	"0x10c",
+/* 10C */	"0x10c",
 /* 10D */	"putnext",
 /* 10E */	"rwnext",
 };
@@ -388,7 +388,7 @@ queue(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	 * If any of the filtering flags is specified, don't print anything
 	 * except the matching pointer.
 	 */
-	if (flag != NULL || not_flag != NULL || mod != NULL || syncq != NULL)
+	if (flag != NULL || not_flag != NULL || mod != NULL || syncq != 0)
 		quiet = TRUE;
 
 	if (DCMD_HDRSPEC(flags) && !quiet) {
@@ -414,7 +414,7 @@ queue(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		return (DCMD_ERR);
 	}
 
-	for (maddr = (uintptr_t)q.q_first; maddr != NULL; nblks++) {
+	for (maddr = (uintptr_t)q.q_first; maddr != 0; nblks++) {
 		if (mdb_vread(&mblk, sizeof (mblk), maddr) == -1) {
 			mdb_warn("couldn't read mblk %p for queue %p",
 			    maddr, addr);
@@ -889,7 +889,7 @@ syncq2q(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 queue_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "qhead") == -1) {
 		mdb_warn("failed to read 'qhead'");
 		return (WALK_ERR);
@@ -904,7 +904,7 @@ queue_link_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (queue_t), wsp->walk_addr) == -1) {
@@ -924,7 +924,7 @@ queue_next_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (queue_t), wsp->walk_addr) == -1) {
@@ -950,7 +950,7 @@ str_walk_init(mdb_walk_state_t *wsp)
 {
 	stdata_t s;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("walk must begin at address of stdata_t\n");
 		return (WALK_ERR);
 	}
@@ -972,7 +972,7 @@ strr_walk_step(mdb_walk_state_t *wsp)
 	queue_t *rq = wsp->walk_data, *wq = rq + 1;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (queue_t) * 2,
@@ -999,7 +999,7 @@ strw_walk_step(mdb_walk_state_t *wsp)
 	queue_t *rq = wsp->walk_data, *wq = rq + 1;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (queue_t) * 2,
@@ -1106,7 +1106,7 @@ b_cont_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (mblk_t), wsp->walk_addr) == -1) {
@@ -1126,7 +1126,7 @@ b_next_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (mblk_t), wsp->walk_addr) == -1) {
@@ -1438,7 +1438,7 @@ strftblk_step(mdb_walk_state_t *wsp)
 	ftblk_t *ftbp;
 	int status = WALK_NEXT;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	ftd = (ftblkdata_t *)wsp->walk_data;
diff --git a/usr/src/cmd/mdb/common/modules/genunix/sysevent.c b/usr/src/cmd/mdb/common/modules/genunix/sysevent.c
index 2fef18f235..793787f189 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/sysevent.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/sysevent.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "sysevent.h"
 
 int
@@ -181,7 +179,7 @@ sysevent_class_list(uintptr_t addr, uint_t flags, int argc,
 int
 sysevent_subclass_list_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("sysevent_subclass_list does not support global "
 		    "walks");
 		return (WALK_ERR);
@@ -196,7 +194,7 @@ sysevent_subclass_list_walk_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (subclass_lst_t),
@@ -230,7 +228,7 @@ sysevent_class_list_walk_init(mdb_walk_state_t *wsp)
 {
 	class_walk_data_t *cl_walker;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("sysevent_class_list does not support global walks");
 		return (WALK_ERR);
 	}
@@ -259,7 +257,7 @@ sysevent_class_list_walk_step(mdb_walk_state_t *wsp)
 	cl_walker = (class_walk_data_t *)wsp->walk_data;
 
 	/* Skip over empty class table entries */
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		if (mdb_vread(&clist, sizeof (class_lst_t),
 		    wsp->walk_addr) == -1) {
 			mdb_warn("failed to read class list at %p",
@@ -380,7 +378,7 @@ sysevent_channel_walk_init(mdb_walk_state_t *wsp)
 {
 	channel_walk_data_t *ch_walker;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("sysevent_channel supports only global walks");
 		return (WALK_ERR);
 	}
@@ -408,7 +406,7 @@ sysevent_channel_walk_step(mdb_walk_state_t *wsp)
 	ch_walker = (channel_walk_data_t *)wsp->walk_data;
 
 	/* Skip over empty hash table entries */
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		if (mdb_vread(&scd, sizeof (sysevent_channel_descriptor_t),
 		    wsp->walk_addr) == -1) {
 			mdb_warn("failed to read channel at %p",
@@ -444,7 +442,7 @@ sysevent_channel_walk_fini(mdb_walk_state_t *wsp)
 int
 sysevent_pend_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&wsp->walk_addr, "log_eventq_head") == -1) {
 			mdb_warn("failed to read 'log_eventq_head'");
 			return (WALK_ERR);
@@ -461,7 +459,7 @@ sysevent_walk_step(mdb_walk_state_t *wsp)
 	int status;
 	uintptr_t ev_arg_addr;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (log_eventq_t),
@@ -480,7 +478,7 @@ sysevent_walk_step(mdb_walk_state_t *wsp)
 int
 sysevent_sent_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&wsp->walk_addr, "log_eventq_sent") == -1) {
 			mdb_warn("failed to read 'log_eventq_sent'");
 			return (WALK_ERR);
diff --git a/usr/src/cmd/mdb/common/modules/genunix/taskq.c b/usr/src/cmd/mdb/common/modules/genunix/taskq.c
index 03e199cc3b..c7de35390b 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/taskq.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/taskq.c
@@ -165,7 +165,7 @@ taskq(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			mdb_warn("unable to walk taskq_cache");
 			return (DCMD_ERR);
 		}
-		tqi.tqi_size += 10; 	/* slop */
+		tqi.tqi_size += 10;	/* slop */
 		tqi.tqi_array = mdb_zalloc(
 		    sizeof (*tqi.tqi_array) * tqi.tqi_size, UM_SLEEP|UM_GC);
 
@@ -320,7 +320,7 @@ taskq_ent_walk_init(mdb_walk_state_t *wsp)
 	taskq_t	tq_head;
 
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("start address required\n");
 		return (WALK_ERR);
 	}
@@ -402,7 +402,7 @@ taskq_thread_walk_init(mdb_walk_state_t *wsp)
 	tti = wsp->walk_data = mdb_zalloc(sizeof (*tti), UM_SLEEP);
 	tti->tti_addr = wsp->walk_addr;
 
-	if (wsp->walk_addr != NULL &&
+	if (wsp->walk_addr != 0 &&
 	    mdb_vread(&tq, sizeof (tq), wsp->walk_addr) != -1 &&
 	    !(tq.tq_flags & TASKQ_DYNAMIC)) {
 
@@ -449,7 +449,7 @@ taskq_thread_walk_step(mdb_walk_state_t *wsp)
 		addr = tti->tti_tlist[tti->tti_idx];
 		tti->tti_idx++;
 
-		if (addr == NULL)
+		if (addr == 0)
 			return (WALK_NEXT);
 
 		if (mdb_vread(&tti->tti_thread, sizeof (kthread_t),
diff --git a/usr/src/cmd/mdb/common/modules/genunix/thread.c b/usr/src/cmd/mdb/common/modules/genunix/thread.c
index 410f9973d8..bd9f3f5320 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/thread.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/thread.c
@@ -58,7 +58,7 @@ thread_walk_init(mdb_walk_state_t *wsp)
 {
 	thread_walk_t *twp = mdb_alloc(sizeof (thread_walk_t), UM_SLEEP);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&wsp->walk_addr, "allthreads") == -1) {
 			mdb_warn("failed to read 'allthreads'");
 			mdb_free(twp, sizeof (thread_walk_t));
@@ -94,7 +94,7 @@ thread_walk_step(mdb_walk_state_t *wsp)
 	thread_walk_t *twp = (thread_walk_t *)wsp->walk_data;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE); /* Proc has 0 threads or allthreads = 0 */
 
 	if (twp->tw_step && wsp->walk_addr == twp->tw_last)
@@ -149,7 +149,7 @@ deathrow_walk_step(mdb_walk_state_t *wsp)
 	kthread_t t;
 	uintptr_t addr = wsp->walk_addr;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&t, sizeof (t), addr) == -1) {
@@ -200,7 +200,7 @@ cpu_dispq_walk_init(mdb_walk_state_t *wsp)
 	dispq_t dispq;
 	disp_t disp;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("cpu_dispq walk needs a cpu_t address\n");
 		return (WALK_ERR);
 	}
@@ -241,7 +241,7 @@ cpupart_dispq_walk_init(mdb_walk_state_t *wsp)
 	cpupart_t cpupart;
 	dispq_t dispq;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("cpupart_dispq walk needs a cpupart_t address\n");
 		return (WALK_ERR);
 	}
@@ -278,7 +278,7 @@ dispq_walk_step(mdb_walk_state_t *wsp)
 	dispq_t dispq;
 	kthread_t t;
 
-	while (addr == NULL) {
+	while (addr == 0) {
 		if (--dw->dw_npri == 0)
 			return (WALK_DONE);
 
@@ -299,7 +299,7 @@ dispq_walk_step(mdb_walk_state_t *wsp)
 	}
 
 	if (addr == dw->dw_last)
-		wsp->walk_addr = NULL;
+		wsp->walk_addr = 0;
 	else
 		wsp->walk_addr = (uintptr_t)t.t_link;
 
@@ -824,7 +824,7 @@ stackinfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	if (mdb_readsym(&allthreads, sizeof (kthread_t *),
 	    "allthreads") == -1) {
 		mdb_warn("failed to read 'allthreads'\n");
-		allthreads = NULL;
+		allthreads = 0;
 	}
 
 	if (history == TRUE) {
@@ -851,7 +851,7 @@ stackinfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			mdb_warn("failed to read 'kmem_stkinfo_log'\n");
 			return (DCMD_ERR);
 		}
-		if (kaddr == NULL) {
+		if (kaddr == 0) {
 			mdb_free((void *)log, usize);
 			return (DCMD_OK);
 		}
diff --git a/usr/src/cmd/mdb/common/modules/genunix/tsd.c b/usr/src/cmd/mdb/common/modules/genunix/tsd.c
index d220ab633c..829244eab7 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/tsd.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/tsd.c
@@ -37,7 +37,7 @@
 int
 tsd_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "tsd_list") == -1) {
 		mdb_warn("failed to read 'tsd_list'");
 		return (WALK_ERR);
@@ -52,7 +52,7 @@ tsd_walk_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data,
@@ -83,14 +83,14 @@ ttotsd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	kthread_t thread, *t = &thread;
 	struct tsd_thread tsdata, *ts = &tsdata;
-	uintptr_t key = NULL;
+	uintptr_t key = 0;
 	uintptr_t eladdr;
 	void *element = NULL;
 
 	if (mdb_getopts(argc, argv, 'k', MDB_OPT_UINTPTR, &key, NULL) != argc)
 		return (DCMD_USAGE);
 
-	if (!(flags & DCMD_ADDRSPEC) || key == NULL)
+	if (!(flags & DCMD_ADDRSPEC) || key == 0)
 		return (DCMD_USAGE);
 
 	if (mdb_vread(t, sizeof (*t), addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/tsol.c b/usr/src/cmd/mdb/common/modules/genunix/tsol.c
index 3810738a62..1c57ff9557 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/tsol.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/tsol.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/tsol/tndb.h>
 #include <sys/modhash_impl.h>
@@ -128,7 +126,7 @@ tnrh_walk_step(mdb_walk_state_t *wsp)
 	tsol_tnrhc_t tnrhc;
 	int status;
 
-	while (wsp->walk_addr == NULL) {
+	while (wsp->walk_addr == 0) {
 		if (*twp->hptr == NULL || twp->idx >= TNRHC_SIZE) {
 			twp->hptr++;
 			if (twp->hptr == twp->tnrhc_table +
diff --git a/usr/src/cmd/mdb/common/modules/genunix/typegraph.c b/usr/src/cmd/mdb/common/modules/genunix/typegraph.c
index d0fa042233..b7f6cf854d 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/typegraph.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/typegraph.c
@@ -219,9 +219,9 @@ typedef struct tg_node {
 	uintptr_t	tgn_base;	/* address base of object */
 	uintptr_t	tgn_limit;	/* address limit of object */
 	tg_edge_t	*tgn_incoming;	/* incoming edges */
-	tg_edge_t 	*tgn_outgoing;	/* outgoing edges */
-	tg_type_t 	*tgn_typelist;	/* conjectured typelist */
-	tg_type_t 	*tgn_fraglist;	/* type fragment list */
+	tg_edge_t	*tgn_outgoing;	/* outgoing edges */
+	tg_type_t	*tgn_typelist;	/* conjectured typelist */
+	tg_type_t	*tgn_fraglist;	/* type fragment list */
 	char		tgn_marked;	/* marked */
 	char		tgn_postmarked;	/* marked in postpass */
 	int		tgn_smaller;	/* size of next-smaller cache */
@@ -252,7 +252,7 @@ typedef struct tg_typeoffs {
 typedef struct tg_buildstate {
 	uintptr_t		tgbs_addr;	/* address of region */
 	uintptr_t		*tgbs_buf;	/* in-core copy of region */
-	size_t 			tgbs_ndx;	/* current pointer index */
+	size_t			tgbs_ndx;	/* current pointer index */
 	size_t			tgbs_nptrs;	/* number of pointers */
 	tg_node_t		*tgbs_src;	/* corresponding node */
 	struct tg_buildstate	*tgbs_next;	/* next stacked or free */
@@ -273,7 +273,7 @@ typedef struct tg_todo {
 } tg_todo_t;
 
 typedef struct tg_nodedata {
-	tg_node_t 		*tgd_next;	/* next node to fill in */
+	tg_node_t		*tgd_next;	/* next node to fill in */
 	size_t			tgd_size;	/* size of this node */
 } tg_nodedata_t;
 
@@ -316,7 +316,7 @@ struct {
  * new entry in tg_typetab[] is likely warranted.)
  */
 struct {
-	char 		*tgt_type_name;		/* filled in statically */
+	char		*tgt_type_name;		/* filled in statically */
 	char		*tgt_actual_name;	/* filled in statically */
 	mdb_ctf_id_t	tgt_type;		/* determined dynamically */
 	mdb_ctf_id_t	tgt_actual_type;	/* determined dynamically */
@@ -904,7 +904,7 @@ typegraph_couldbe(uintptr_t addr, mdb_ctf_id_t type)
 
 	rsize = mdb_ctf_type_size(rtype);
 
-	if (val == NULL || rsize == 0)
+	if (val == 0 || rsize == 0)
 		return (1);
 
 	/*
@@ -1209,7 +1209,7 @@ typegraph_build_anchored(uintptr_t addr, size_t size, mdb_ctf_id_t type)
 	ssize_t rval;
 	int mask = sizeof (uintptr_t) - 1;
 
-	if (addr == NULL || size < sizeof (uintptr_t))
+	if (addr == 0 || size < sizeof (uintptr_t))
 		return;
 
 	/*
@@ -2932,7 +2932,7 @@ findlocks_findmutex(const char *name, mdb_ctf_id_t type, ulong_t offs,
 
 	if (mdb_ctf_type_cmp(type, mutex) == 0) {
 		mdb_ctf_id_t ttype;
-		uintptr_t owner = NULL;
+		uintptr_t owner = 0;
 		tg_node_t *node;
 
 		if (mdb_pwalk("mutex_owner",
@@ -2943,7 +2943,7 @@ findlocks_findmutex(const char *name, mdb_ctf_id_t type, ulong_t offs,
 		/*
 		 * Check to see if the owner is a thread.
 		 */
-		if (owner == NULL || (node = typegraph_search(owner)) == NULL)
+		if (owner == 0 || (node = typegraph_search(owner)) == NULL)
 			return (0);
 
 		if (!mdb_ctf_type_valid(node->tgn_type))
@@ -2957,7 +2957,7 @@ findlocks_findmutex(const char *name, mdb_ctf_id_t type, ulong_t offs,
 		if (mdb_ctf_type_cmp(ttype, thread) != 0)
 			return (0);
 
-		if (fl->fl_thread != NULL && owner != fl->fl_thread)
+		if (fl->fl_thread != 0 && owner != fl->fl_thread)
 			return (0);
 
 		if (fl->fl_ndx >= fl->fl_nlocks) {
@@ -3139,7 +3139,7 @@ findlocks(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	mdb_printf("findlocks: nota bene: %slocks may be held",
 	    fl.fl_nlocks ? "other " : "");
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_printf("\n");
 	} else {
 		mdb_printf(" by %p\n", addr);
@@ -3179,7 +3179,7 @@ findlocks(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
  * looking for nodes that satisfy the following criteria:
  *
  *  (a)	The node is an array.  That is, the node was either determined to
- * 	be of type CTF_K_ARRAY, or the node was inferred to be an array in
+ *	be of type CTF_K_ARRAY, or the node was inferred to be an array in
  *	pass2 of type identification (described above).
  *
  *  (b)	Each element of the array is a structure that is smaller than the
diff --git a/usr/src/cmd/mdb/common/modules/genunix/vfs.c b/usr/src/cmd/mdb/common/modules/genunix/vfs.c
index 578f8ce6b1..2a45f762f3 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/vfs.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/vfs.c
@@ -53,7 +53,7 @@
 int
 vfs_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "rootvfs") == -1) {
 		mdb_warn("failed to read 'rootvfs'");
 		return (WALK_ERR);
@@ -373,7 +373,7 @@ next_realvp(uintptr_t invp, struct vnode *outvn, uintptr_t *outvp)
 		*outvp = (uintptr_t)stream.sd_vnode;
 	}
 
-	if (*outvp == invp || *outvp == NULL)
+	if (*outvp == invp || *outvp == 0)
 		return (REALVP_DONE);
 
 	return (REALVP_CONTINUE);
@@ -499,7 +499,7 @@ pfiles_dig_pathname(uintptr_t vp, char *path)
 				vp = (uintptr_t)
 				    sockparams.sp_sdev_info.sd_vnode;
 			} else {
-				vp = NULL;
+				vp = 0;
 			}
 		}
 	}
@@ -514,8 +514,8 @@ pfiles_dig_pathname(uintptr_t vp, char *path)
 	/*
 	 * A common problem is that device pathnames are prefixed with
 	 * /dev/../devices/.  We just clean those up slightly:
-	 * 	/dev/../devices/<mumble> --> /devices/<mumble>
-	 * 	/dev/pts/../../devices/<mumble> --> /devices/<mumble>
+	 *	/dev/../devices/<mumble> --> /devices/<mumble>
+	 *	/dev/pts/../../devices/<mumble> --> /devices/<mumble>
 	 */
 	if (strncmp("/dev/../devices/", path, strlen("/dev/../devices/")) == 0)
 		strcpy(path, path + 7);
@@ -599,7 +599,7 @@ sctp_getsockaddr(sctp_t *sctp, struct sockaddr *addr)
 		for (l = 0; l < sctp->sctp_saddrs[i].ipif_count; l++) {
 			sctp_ipif_t	ipif;
 			in6_addr_t	laddr;
-			list_node_t 	*pnode;
+			list_node_t	*pnode;
 			list_node_t	node;
 
 			if (mdb_vread(&ipif, sizeof (sctp_ipif_t),
@@ -935,7 +935,7 @@ pfile_callback(uintptr_t addr, const struct file *f, struct pfiles_cbdata *cb)
 
 	cb->fd++;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		return (WALK_NEXT);
 	}
 
@@ -958,7 +958,7 @@ pfile_callback(uintptr_t addr, const struct file *f, struct pfiles_cbdata *cb)
 		uintptr_t next_realvpp;
 
 		err = next_realvp(realvpp, &layer_vn, &next_realvpp);
-		if (next_realvpp != NULL)
+		if (next_realvpp != 0)
 			realvpp = next_realvpp;
 
 	} while (err == REALVP_CONTINUE);
@@ -1118,7 +1118,7 @@ file_t_callback(uintptr_t addr, const struct file *f, struct pfiles_cbdata *cb)
 
 	cb->fd++;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		return (WALK_NEXT);
 	}
 
diff --git a/usr/src/cmd/mdb/common/modules/genunix/zone.c b/usr/src/cmd/mdb/common/modules/genunix/zone.c
index a332cdfc01..49cd3e7b6e 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/zone.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/zone.c
@@ -255,7 +255,7 @@ zone_walk_init(mdb_walk_state_t *wsp)
 {
 	GElf_Sym sym;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_lookup_by_name("zone_active", &sym) == -1) {
 			mdb_warn("failed to find 'zone_active'");
 			return (WALK_ERR);
@@ -279,7 +279,7 @@ zone_walk_step(mdb_walk_state_t *wsp)
 int
 zsd_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("global walk not supported\n");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/hook/hook.c b/usr/src/cmd/mdb/common/modules/hook/hook.c
index 353a592c64..7970dbb4a0 100644
--- a/usr/src/cmd/mdb/common/modules/hook/hook.c
+++ b/usr/src/cmd/mdb/common/modules/hook/hook.c
@@ -215,7 +215,7 @@ hookevent_stack_walk_init(mdb_walk_state_t *wsp)
 {
 	hook_family_int_t hf;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("global walk not supported\n");
 		return (WALK_ERR);
 	}
@@ -241,7 +241,7 @@ hookevent_stack_walk_step(mdb_walk_state_t *wsp)
 		return (DCMD_ERR);
 	}
 	wsp->walk_addr = (uintptr_t)SLIST_NEXT(&hr, hei_entry);
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 	return (wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
 	    wsp->walk_cbdata));
diff --git a/usr/src/cmd/mdb/common/modules/idm/idm.c b/usr/src/cmd/mdb/common/modules/idm/idm.c
index 4e4ad832c5..843f423b7f 100644
--- a/usr/src/cmd/mdb/common/modules/idm/idm.c
+++ b/usr/src/cmd/mdb/common/modules/idm/idm.c
@@ -667,7 +667,7 @@ iscsi_cmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if (!(flags & DCMD_ADDRSPEC)) {
 		if (mdb_pwalk("iscsi_ini_hba", iscsi_ini_hba_walk_cb,
-		    &idc, NULL) == -1) {
+		    &idc, 0) == -1) {
 			mdb_warn("iscsi cmd hba list walk failed");
 			return (DCMD_ERR);
 		}
@@ -796,7 +796,7 @@ iscsi_walk_all_sess(iscsi_dcmd_ctrl_t *idc)
 		/* Always print hba info on this path */
 		idc->u.child.idc_hba = 1;
 		if (mdb_pwalk("iscsi_ini_hba", iscsi_ini_hba_walk_cb,
-		    idc, NULL) == -1) {
+		    idc, 0) == -1) {
 			mdb_warn("iscsi cmd hba list walk failed");
 			return (DCMD_ERR);
 		}
@@ -1909,7 +1909,7 @@ iscsi_conn_impl(uintptr_t addr, iscsi_dcmd_ctrl_t *idc)
 				return (DCMD_ERR);
 			}
 
-			if (task_addr == NULL) {
+			if (task_addr == 0) {
 				task_ptr += sizeof (uintptr_t);
 				task_idx++;
 				continue;
@@ -3228,7 +3228,7 @@ iscsi_isns(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 iscsi_ini_sess_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<iscsi_sess_t addr>::walk iscsi_ini_sess");
 		return (WALK_ERR);
 	}
@@ -3247,7 +3247,7 @@ iscsi_ini_sess_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -3269,7 +3269,7 @@ iscsi_ini_sess_step(mdb_walk_state_t *wsp)
 static int
 iscsi_ini_conn_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<iscsi_conn_t addr>::walk iscsi_ini_conn");
 		return (WALK_DONE);
 	}
@@ -3288,7 +3288,7 @@ iscsi_ini_conn_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -3311,7 +3311,7 @@ iscsi_ini_conn_step(mdb_walk_state_t *wsp)
 static int
 iscsi_ini_lun_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<iscsi_lun_t addr>::walk iscsi_ini_lun");
 		return (WALK_DONE);
 	}
@@ -3329,7 +3329,7 @@ iscsi_ini_lun_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -3351,7 +3351,7 @@ iscsi_ini_lun_step(mdb_walk_state_t *wsp)
 static int
 iscsi_ini_cmd_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<iscsi_cmd_t addr>::walk iscsi_ini_cmd");
 		return (WALK_DONE);
 	}
@@ -3369,7 +3369,7 @@ iscsi_ini_cmd_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -3422,7 +3422,7 @@ iscsi_ini_hba_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("iscsi_ini_hba only supports global walk");
 		return (WALK_ERR);
 	} else {
diff --git a/usr/src/cmd/mdb/common/modules/ip/ip.c b/usr/src/cmd/mdb/common/modules/ip/ip.c
index d79347cde2..e403789479 100644
--- a/usr/src/cmd/mdb/common/modules/ip/ip.c
+++ b/usr/src/cmd/mdb/common/modules/ip/ip.c
@@ -72,7 +72,7 @@ static const bitname_t squeue_states[] = {
 	{ "SQS_WORKER",		"... by a worker thread" },
 	{ "SQS_ENTER",		"... by an squeue_enter() thread" },
 	{ "SQS_FAST",		"... in fast-path mode" },
-	{ "SQS_USER", 		"A non interrupt user" },
+	{ "SQS_USER",		"A non interrupt user" },
 	{ "SQS_BOUND",		"worker thread bound to CPU" },
 	{ "SQS_PROFILE",	"profiling enabled" },
 	{ "SQS_REENTER",	"re-entered thred" },
@@ -88,7 +88,7 @@ typedef struct illif_walk_data {
 typedef struct ncec_walk_data_s {
 	struct ndp_g_s	ncec_ip_ndp;
 	int		ncec_hash_tbl_index;
-	ncec_t 		ncec;
+	ncec_t		ncec;
 } ncec_walk_data_t;
 
 typedef struct ncec_cbdata_s {
@@ -128,7 +128,7 @@ typedef struct ipcl_hash_walk_data_s {
 } ipcl_hash_walk_data_t;
 
 typedef struct ill_walk_data_s {
-	ill_t 		ill;
+	ill_t		ill;
 } ill_walk_data_t;
 
 typedef struct ill_cbdata_s {
@@ -139,13 +139,13 @@ typedef struct ill_cbdata_s {
 } ill_cbdata_t;
 
 typedef struct ipif_walk_data_s {
-	ipif_t 		ipif;
+	ipif_t		ipif;
 } ipif_walk_data_t;
 
 typedef struct ipif_cbdata_s {
 	ill_t		ill;
 	int		ipif_ipversion;
-	boolean_t 	verbose;
+	boolean_t	verbose;
 } ipif_cbdata_t;
 
 typedef struct hash_walk_arg_s {
@@ -179,7 +179,7 @@ static hash_walk_arg_t proto_v6_hash_arg = {
 };
 
 typedef struct ip_list_walk_data_s {
-	off_t 	nextoff;
+	off_t	nextoff;
 } ip_list_walk_data_t;
 
 typedef struct ip_list_walk_arg_s {
@@ -419,7 +419,7 @@ tcps_sc_walk_init(mdb_walk_state_t *wsp)
 {
 	tcp_stack_t tcps;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&tcps, sizeof (tcps), wsp->walk_addr) == -1) {
@@ -477,7 +477,7 @@ th_hash_walk_init(mdb_walk_state_t *wsp)
 	GElf_Sym sym;
 	list_node_t *next;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_lookup_by_obj("ip", "ip_thread_list", &sym) == 0) {
 			wsp->walk_addr = sym.st_value;
 		} else {
@@ -517,7 +517,7 @@ illif_stack_walk_init(mdb_walk_state_t *wsp)
 {
 	illif_walk_data_t *iw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("illif_stack supports only local walks\n");
 		return (WALK_ERR);
 	}
@@ -863,7 +863,7 @@ ire_next_walk_step(mdb_walk_state_t *wsp)
 	int status;
 
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&ire, sizeof (ire), wsp->walk_addr) == -1) {
@@ -1687,7 +1687,7 @@ ip_rnext(const queue_t *q)
 	    (uintptr_t)q->q_ptr) == sizeof (ill))
 		return ((uintptr_t)ill.ill_rq);
 
-	return (NULL);
+	return (0);
 }
 
 uintptr_t
@@ -1700,7 +1700,7 @@ ip_wnext(const queue_t *q)
 	    (uintptr_t)q->q_ptr) == sizeof (ill))
 		return ((uintptr_t)ill.ill_wq);
 
-	return (NULL);
+	return (0);
 }
 
 /*
@@ -1872,7 +1872,7 @@ th_trace(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			return (DCMD_ERR);
 		}
 	}
-	if (mdb_pwalk("th_hash", th_hash_summary, &thw, NULL) == -1) {
+	if (mdb_pwalk("th_hash", th_hash_summary, &thw, 0) == -1) {
 		mdb_warn("can't walk th_hash entries");
 		return (DCMD_ERR);
 	}
@@ -2243,7 +2243,7 @@ ncec_get_next_hash_tbl(uintptr_t start, int *index, struct ndp_g_s ndp)
 	uintptr_t addr = start;
 	int i = *index;
 
-	while (addr == NULL) {
+	while (addr == 0) {
 
 		if (++i >= NCE_TABLE_SIZE)
 			break;
@@ -2288,21 +2288,21 @@ static uintptr_t
 ipcl_hash_get_next_connf_tbl(ipcl_hash_walk_data_t *iw)
 {
 	struct connf_s connf;
-	uintptr_t addr = NULL, next;
+	uintptr_t addr = 0, next;
 	int index = iw->connf_tbl_index;
 
 	do {
 		next = iw->hash_tbl + index * sizeof (struct connf_s);
 		if (++index >= iw->hash_tbl_size) {
-			addr = NULL;
+			addr = 0;
 			break;
 		}
 		if (mdb_vread(&connf, sizeof (struct connf_s), next) == -1)  {
 			mdb_warn("failed to read conn_t at %p", next);
-			return (NULL);
+			return (0);
 		}
 		addr = (uintptr_t)connf.connf_head;
-	} while (addr == NULL);
+	} while (addr == 0);
 	iw->connf_tbl_index = index;
 	return (addr);
 }
@@ -2343,7 +2343,7 @@ ipcl_hash_walk_init(mdb_walk_state_t *wsp)
 	wsp->walk_addr = ipcl_hash_get_next_connf_tbl(iw);
 	wsp->walk_data = iw;
 
-	if (wsp->walk_addr != NULL)
+	if (wsp->walk_addr != 0)
 		return (WALK_NEXT);
 	else
 		return (WALK_DONE);
@@ -2357,7 +2357,7 @@ ipcl_hash_walk_step(mdb_walk_state_t *wsp)
 	conn_t *conn = iw->conn;
 	int ret = WALK_DONE;
 
-	while (addr != NULL) {
+	while (addr != 0) {
 		if (mdb_vread(conn, sizeof (conn_t), addr) == -1) {
 			mdb_warn("failed to read conn_t at %p", addr);
 			return (WALK_ERR);
@@ -2370,7 +2370,7 @@ ipcl_hash_walk_step(mdb_walk_state_t *wsp)
 	if (ret == WALK_NEXT) {
 		wsp->walk_addr = ipcl_hash_get_next_connf_tbl(iw);
 
-		if (wsp->walk_addr != NULL)
+		if (wsp->walk_addr != 0)
 			return (WALK_NEXT);
 		else
 			return (WALK_DONE);
@@ -2396,7 +2396,7 @@ ncec_stack_walk_init(mdb_walk_state_t *wsp)
 {
 	ncec_walk_data_t *nw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("ncec_stack requires ndp_g_s address\n");
 		return (WALK_ERR);
 	}
@@ -2415,7 +2415,7 @@ ncec_stack_walk_init(mdb_walk_state_t *wsp)
 	 * ncec_get_next_hash_tbl() starts at ++i , so initialize index to -1
 	 */
 	nw->ncec_hash_tbl_index = -1;
-	wsp->walk_addr = ncec_get_next_hash_tbl(NULL,
+	wsp->walk_addr = ncec_get_next_hash_tbl(0,
 	    &nw->ncec_hash_tbl_index, nw->ncec_ip_ndp);
 	wsp->walk_data = nw;
 
@@ -2428,7 +2428,7 @@ ncec_stack_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	ncec_walk_data_t *nw = wsp->walk_data;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&nw->ncec, sizeof (ncec_t), addr) == -1) {
@@ -2543,7 +2543,7 @@ ill_format(uintptr_t addr, const void *illptr, void *ill_cb_arg)
 		{ "S",		PHYI_STANDBY,		PHYI_STANDBY	},
 		{ "i",		PHYI_INACTIVE,		PHYI_INACTIVE	},
 		{ "O",		PHYI_OFFLINE,		PHYI_OFFLINE	},
-		{ "T", 		ILLF_NOTRAILERS,	ILLF_NOTRAILERS },
+		{ "T",		ILLF_NOTRAILERS,	ILLF_NOTRAILERS },
 		{ "A",		ILLF_NOARP,		ILLF_NOARP	},
 		{ "M",		ILLF_MULTICAST,		ILLF_MULTICAST	},
 		{ "F",		ILLF_ROUTER,		ILLF_ROUTER	},
@@ -2713,7 +2713,7 @@ ip_list_walk_init(mdb_walk_state_t *wsp)
 	ip_list_walk_data_t *iw;
 	uintptr_t addr = (uintptr_t)(wsp->walk_addr + arg->off);
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("only local walks supported\n");
 		return (WALK_ERR);
 	}
@@ -2735,7 +2735,7 @@ ip_list_walk_step(mdb_walk_state_t *wsp)
 	ip_list_walk_data_t *iw = wsp->walk_data;
 	uintptr_t addr = wsp->walk_addr;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 	wsp->walk_addr = addr + iw->nextoff;
 	if (mdb_vread(&wsp->walk_addr, sizeof (uintptr_t),
@@ -3183,14 +3183,14 @@ ilb_rules_walk_init(mdb_walk_state_t *wsp)
 {
 	ilb_stack_t ilbs;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&ilbs, sizeof (ilbs), wsp->walk_addr) == -1) {
 		mdb_warn("failed to read ilb_stack_t at %p", wsp->walk_addr);
 		return (WALK_ERR);
 	}
-	if ((wsp->walk_addr = (uintptr_t)ilbs.ilbs_rule_head) != NULL)
+	if ((wsp->walk_addr = (uintptr_t)ilbs.ilbs_rule_head) != 0)
 		return (WALK_NEXT);
 	else
 		return (WALK_DONE);
@@ -3209,7 +3209,7 @@ ilb_rules_walk_step(mdb_walk_state_t *wsp)
 	status = wsp->walk_callback(wsp->walk_addr, &rule, wsp->walk_cbdata);
 	if (status != WALK_NEXT)
 		return (status);
-	if ((wsp->walk_addr = (uintptr_t)rule.ir_next) == NULL)
+	if ((wsp->walk_addr = (uintptr_t)rule.ir_next) == 0)
 		return (WALK_DONE);
 	else
 		return (WALK_NEXT);
@@ -3220,14 +3220,14 @@ ilb_servers_walk_init(mdb_walk_state_t *wsp)
 {
 	ilb_rule_t rule;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&rule, sizeof (rule), wsp->walk_addr) == -1) {
 		mdb_warn("failed to read ilb_rule_t at %p", wsp->walk_addr);
 		return (WALK_ERR);
 	}
-	if ((wsp->walk_addr = (uintptr_t)rule.ir_servers) != NULL)
+	if ((wsp->walk_addr = (uintptr_t)rule.ir_servers) != 0)
 		return (WALK_NEXT);
 	else
 		return (WALK_DONE);
@@ -3246,7 +3246,7 @@ ilb_servers_walk_step(mdb_walk_state_t *wsp)
 	status = wsp->walk_callback(wsp->walk_addr, &server, wsp->walk_cbdata);
 	if (status != WALK_NEXT)
 		return (status);
-	if ((wsp->walk_addr = (uintptr_t)server.iser_next) == NULL)
+	if ((wsp->walk_addr = (uintptr_t)server.iser_next) == 0)
 		return (WALK_DONE);
 	else
 		return (WALK_NEXT);
@@ -3271,7 +3271,7 @@ ilb_nat_src_walk_init(mdb_walk_state_t *wsp)
 	ilb_walk_t *ns_walk;
 	ilb_nat_src_entry_t *entry = NULL;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	ns_walk = mdb_alloc(sizeof (ilb_walk_t), UM_SLEEP);
@@ -3410,7 +3410,7 @@ ilb_conn_walk_init(mdb_walk_state_t *wsp)
 	ilb_walk_t *conn_walk;
 	ilb_conn_hash_t head;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	conn_walk = mdb_alloc(sizeof (ilb_walk_t), UM_SLEEP);
@@ -3512,7 +3512,7 @@ ilb_sticky_walk_init(mdb_walk_state_t *wsp)
 	ilb_walk_t *sticky_walk;
 	ilb_sticky_t *st = NULL;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	sticky_walk = mdb_alloc(sizeof (ilb_walk_t), UM_SLEEP);
diff --git a/usr/src/cmd/mdb/common/modules/ipc/ipc.c b/usr/src/cmd/mdb/common/modules/ipc/ipc.c
index 5871e45dd9..97102579cf 100644
--- a/usr/src/cmd/mdb/common/modules/ipc/ipc.c
+++ b/usr/src/cmd/mdb/common/modules/ipc/ipc.c
@@ -355,7 +355,7 @@ ds_walk_init(mdb_walk_state_t *wsp)
 {
 	ipc_ops_vec_t	*iv = wsp->walk_arg;
 
-	if (wsp->walk_arg != NULL && wsp->walk_addr != NULL)
+	if (wsp->walk_arg != NULL && wsp->walk_addr != 0)
 		mdb_printf("ignoring provided address\n");
 
 	if (wsp->walk_arg)
diff --git a/usr/src/cmd/mdb/common/modules/ipp/ipp.c b/usr/src/cmd/mdb/common/modules/ipp/ipp.c
index fbd6780b54..8af4103c20 100644
--- a/usr/src/cmd/mdb/common/modules/ipp/ipp.c
+++ b/usr/src/cmd/mdb/common/modules/ipp/ipp.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/time.h>
 #include <ipp/ipp.h>
 #include <ipp/ipp_impl.h>
@@ -101,7 +99,7 @@ byid_walk_step(
 	mdb_walk_state_t *wsp)
 {
 	int		status;
-	void 		*ptr;
+	void		*ptr;
 
 	if (mdb_vread(&ptr, sizeof (void *), wsp->walk_addr) == -1) {
 		mdb_warn("failed to read from address %p", wsp->walk_addr);
@@ -495,7 +493,7 @@ static int
 ref_walk_init(
 	mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	return (WALK_NEXT);
@@ -508,7 +506,7 @@ ref_walk_step(
 	ipp_ref_t	*rp;
 	int		status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	rp = mdb_alloc(sizeof (ipp_ref_t), UM_SLEEP);
diff --git a/usr/src/cmd/mdb/common/modules/krtld/krtld.c b/usr/src/cmd/mdb/common/modules/krtld/krtld.c
index 6ef2e230c2..6daa4504de 100644
--- a/usr/src/cmd/mdb/common/modules/krtld/krtld.c
+++ b/usr/src/cmd/mdb/common/modules/krtld/krtld.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/machelf.h>
 #include <sys/modctl.h>
 #include <sys/kobj.h>
@@ -45,9 +43,9 @@ modctl_walk_init(mdb_walk_state_t *wsp)
 	struct modctl_walk_data *mwd = mdb_alloc(
 	    sizeof (struct modctl_walk_data), UM_SLEEP);
 
-	mwd->mwd_head = (wsp->walk_addr == NULL ? module_head : wsp->walk_addr);
+	mwd->mwd_head = (wsp->walk_addr == 0 ? module_head : wsp->walk_addr);
 	wsp->walk_data = mwd;
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = 0;
 
 	return (WALK_NEXT);
 }
@@ -61,7 +59,7 @@ modctl_walk_step(mdb_walk_state_t *wsp)
 	if (wsp->walk_addr == mwd->mwd_head)
 		return (WALK_DONE);
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		wsp->walk_addr = mwd->mwd_head;
 
 	if (mdb_vread(&mwd->mwd_modctl, sizeof (struct modctl),
diff --git a/usr/src/cmd/mdb/common/modules/libc/findstack_subr.c b/usr/src/cmd/mdb/common/modules/libc/findstack_subr.c
index 01e4729475..fee41df74e 100644
--- a/usr/src/cmd/mdb/common/modules/libc/findstack_subr.c
+++ b/usr/src/cmd/mdb/common/modules/libc/findstack_subr.c
@@ -105,7 +105,7 @@ sobj_text_to_ops(const char *name, uintptr_t *sobj_ops_out)
 void
 sobj_ops_to_text(uintptr_t addr, char *out, size_t sz)
 {
-	(void) snprintf(out, sz, "%s", addr == NULL ? "<none>" : (char *)addr);
+	(void) snprintf(out, sz, "%s", addr == 0 ? "<none>" : (char *)addr);
 }
 
 static int
@@ -259,7 +259,7 @@ stacks_findstack(uintptr_t addr, findstack_info_t *fsip, uint_t print_warnings)
 	}
 
 	fsip->fsi_tstate = ulwp.ul_sleepq != NULL;
-	fsip->fsi_sobj_ops = (uintptr_t)(ulwp.ul_sleepq == NULL ? NULL :
+	fsip->fsi_sobj_ops = (uintptr_t)(ulwp.ul_sleepq == NULL ? 0 :
 	    (ulwp.ul_qtype == MX ? STACKS_SOBJ_MX : STACKS_SOBJ_CV));
 
 	if (mdb_getareg(addr, STACKS_REGS_FP, &reg) != 0) {
@@ -278,14 +278,14 @@ stacks_findstack(uintptr_t addr, findstack_info_t *fsip, uint_t print_warnings)
 	fsip->fsi_pc = (uintptr_t)reg;
 #endif
 
-	while (fp != NULL) {
+	while (fp != 0) {
 		if (mdb_vread(&frame, sizeof (frame), fp) == -1) {
 			mdb_warn("couldn't read frame for thread 0x%p at %p",
 			    addr, fp);
 			return (-1);
 		}
 
-		if (frame.rw_rtn == NULL)
+		if (frame.rw_rtn == 0)
 			break;
 
 		if (fsip->fsi_depth < fsip->fsi_max_depth) {
diff --git a/usr/src/cmd/mdb/common/modules/libc/libc.c b/usr/src/cmd/mdb/common/modules/libc/libc.c
index c296aa9d04..1f704926fe 100644
--- a/usr/src/cmd/mdb/common/modules/libc/libc.c
+++ b/usr/src/cmd/mdb/common/modules/libc/libc.c
@@ -324,7 +324,7 @@ uc_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	ucontext_t uc;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&uc, sizeof (uc), addr) != sizeof (uc)) {
@@ -346,7 +346,7 @@ oldc_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("walker only supports global walk\n");
 		return (WALK_ERR);
 	}
@@ -378,7 +378,7 @@ oldc_walk_step(mdb_walk_state_t *wsp)
 		uintptr_t addr = lsp->pr_oldcontext;
 		ucontext_t uc;
 
-		if (addr == NULL)
+		if (addr == 0)
 			return (WALK_NEXT);
 
 		if (mdb_vread(&uc, sizeof (uc), addr) != sizeof (uc)) {
@@ -718,17 +718,17 @@ uberdata_addr(void)
 
 	if (mdb_lookup_by_obj("libc.so.1", "_tdb_bootstrap", &sym) != 0) {
 		mdb_warn("cannot find libc.so.1`_tdb_bootstrap");
-		return (NULL);
+		return (0);
 	}
 	if (mdb_vread(&addr, sizeof (addr), sym.st_value) == sizeof (addr) &&
-	    addr != NULL &&
+	    addr != 0 &&
 	    mdb_vread(&uaddr, sizeof (uaddr), addr) == sizeof (uaddr) &&
-	    uaddr != NULL) {
+	    uaddr != 0) {
 		return (uaddr);
 	}
 	if (mdb_lookup_by_obj("libc.so.1", "_uberdata", &sym) != 0) {
 		mdb_warn("cannot find libc.so.1`_uberdata");
-		return (NULL);
+		return (0);
 	}
 	return ((uintptr_t)sym.st_value);
 }
@@ -745,7 +745,7 @@ d_uberdata(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if (argc != 0)
 		return (DCMD_USAGE);
-	if (!(flags & DCMD_ADDRSPEC) && (addr = uberdata_addr()) == NULL)
+	if (!(flags & DCMD_ADDRSPEC) && (addr = uberdata_addr()) == 0)
 		return (DCMD_ERR);
 
 	if (mdb_vread(&uberdata, sizeof (uberdata), addr) !=
@@ -922,14 +922,14 @@ ulwp_walk_init(mdb_walk_state_t *wsp)
 		    "platform's offset for uberdata.all_lwps");
 	}
 
-	if (addr == NULL &&
-	    ((uber_addr = uberdata_addr()) == NULL ||
+	if (addr == 0 &&
+	    ((uber_addr = uberdata_addr()) == 0 ||
 	    mdb_vread(&addr, sizeof (addr), uber_addr + offset)
 	    != sizeof (addr))) {
 		mdb_warn("cannot find 'uberdata.all_lwps'");
 		return (WALK_ERR);
 	}
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 	wsp->walk_addr = addr;
 	wsp->walk_data = (void *)addr;
@@ -942,7 +942,7 @@ ulwp_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	ulwp_t ulwp;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 	if (mdb_vread(&ulwp, sizeof (ulwp), addr) != sizeof (ulwp) &&
 	    (bzero(&ulwp, sizeof (ulwp)),
@@ -956,7 +956,7 @@ ulwp_walk_step(mdb_walk_state_t *wsp)
 	 */
 	if ((wsp->walk_addr = (uintptr_t)ulwp.ul_forw)
 	    == (uintptr_t)wsp->walk_data)
-		wsp->walk_addr = NULL;
+		wsp->walk_addr = 0;
 	return (wsp->walk_callback(addr, &ulwp, wsp->walk_cbdata));
 }
 
@@ -1107,13 +1107,13 @@ d_tsd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	mdb_libc_ulwp_t u;
 	uintptr_t ulwp_addr;
-	uintptr_t key = NULL;
+	uintptr_t key = 0;
 	void *element = NULL;
 
 	if (mdb_getopts(argc, argv, 'k', MDB_OPT_UINTPTR, &key, NULL) != argc)
 		return (DCMD_USAGE);
 
-	if (!(flags & DCMD_ADDRSPEC) || key == NULL)
+	if (!(flags & DCMD_ADDRSPEC) || key == 0)
 		return (DCMD_USAGE);
 
 	if (tid2ulwp_impl(addr, &ulwp_addr) != DCMD_OK)
diff --git a/usr/src/cmd/mdb/common/modules/libproc/libproc.c b/usr/src/cmd/mdb/common/modules/libproc/libproc.c
index c0a3314f49..09530ea322 100644
--- a/usr/src/cmd/mdb/common/modules/libproc/libproc.c
+++ b/usr/src/cmd/mdb/common/modules/libproc/libproc.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libproc.h>
 #include <Pcontrol.h>
 #include <stddef.h>
@@ -36,8 +34,8 @@ typedef struct ps_prochandle ps_prochandle_t;
 /*
  * addr::pr_symtab [-a | n]
  *
- * 	-a	Sort symbols by address
- * 	-n	Sort symbols by name
+ *	-a	Sort symbols by address
+ *	-n	Sort symbols by name
  *
  * Given a sym_tbl_t, dump its contents in tabular form.  When given '-a' or
  * '-n', we use the sorted tables 'sym_byaddr' or 'sym_byname', respectively.
@@ -234,7 +232,7 @@ pr_file_info_walk_init(mdb_walk_state_t *wsp)
 	ps_prochandle_t psp;
 	file_info_walk_t *fiw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("pr_file_info doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -300,7 +298,7 @@ pr_map_info_walk_init(mdb_walk_state_t *wsp)
 	ps_prochandle_t psp;
 	map_info_walk_t *miw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("pr_map_info doesn't support global walks\n");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/libpython/libpython.c b/usr/src/cmd/mdb/common/modules/libpython/libpython.c
index 57b8eaec70..19e40b2476 100644
--- a/usr/src/cmd/mdb/common/modules/libpython/libpython.c
+++ b/usr/src/cmd/mdb/common/modules/libpython/libpython.c
@@ -200,7 +200,7 @@ py_walk_step(mdb_walk_state_t *wsp)
 
 	addr = pydb_iter_next(pdi);
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		return (WALK_DONE);
 	}
 
diff --git a/usr/src/cmd/mdb/common/modules/libsysevent/libsysevent.c b/usr/src/cmd/mdb/common/modules/libsysevent/libsysevent.c
index 73e8bcbec8..3829fb3f8e 100644
--- a/usr/src/cmd/mdb/common/modules/libsysevent/libsysevent.c
+++ b/usr/src/cmd/mdb/common/modules/libsysevent/libsysevent.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/sysevent.h>
 #include <sys/sysevent_impl.h>
 #include <libsysevent.h>
@@ -128,7 +126,7 @@ static const mdb_dcmd_t dcmds[] = {
 int
 sysevent_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("sysevent does not support global walks");
 		return (WALK_ERR);
 	}
@@ -142,7 +140,7 @@ sysevent_walk_step(mdb_walk_state_t *wsp)
 	int status;
 	sysevent_queue_t se_q;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&se_q, sizeof (se_q), wsp->walk_addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c b/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c
index 8307caf535..a607dc0f30 100644
--- a/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c
+++ b/usr/src/cmd/mdb/common/modules/libtopo/libtopo.c
@@ -573,7 +573,7 @@ ttree_walk_init(mdb_walk_state_t *wsp)
 {
 	topo_hdl_t th;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("NULL topo_hdl_t passed in");
 		return (WALK_ERR);
 	}
@@ -596,7 +596,7 @@ ttree_walk_step(mdb_walk_state_t *wsp)
 	int rv;
 	ttree_t *tree;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (ttree_t), wsp->walk_addr)
@@ -628,7 +628,7 @@ tmod_walk_init(mdb_walk_state_t *wsp)
 {
 	topo_hdl_t th;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("NULL topo_hdl_t passed in");
 		return (WALK_ERR);
 	}
@@ -667,7 +667,7 @@ tmod_walk_step(mdb_walk_state_t *wsp)
 	int rv;
 	topo_mod_t *tm;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (topo_mod_t), wsp->walk_addr)
@@ -693,7 +693,7 @@ tmod_walk_step(mdb_walk_state_t *wsp)
 			return (DCMD_ERR);
 		}
 	else
-		wsp->walk_addr = NULL;
+		wsp->walk_addr = 0;
 
 	return (rv);
 }
@@ -710,7 +710,7 @@ tpg_walk_init(mdb_walk_state_t *wsp)
 {
 	tnode_t node;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("NULL tnode_t passed in");
 		return (WALK_ERR);
 	}
@@ -733,7 +733,7 @@ tpg_walk_step(mdb_walk_state_t *wsp)
 	int rv;
 	topo_pgroup_t *tpgp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (topo_pgroup_t), wsp->walk_addr)
@@ -766,7 +766,7 @@ tpl_walk_init(mdb_walk_state_t *wsp)
 {
 	topo_pgroup_t pg;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("NULL topo_pgroup_t passed in");
 		return (WALK_ERR);
 	}
@@ -789,7 +789,7 @@ tpl_walk_step(mdb_walk_state_t *wsp)
 	int rv;
 	topo_proplist_t *plp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (topo_proplist_t), wsp->walk_addr)
@@ -823,7 +823,7 @@ tnh_walk_init(mdb_walk_state_t *wsp)
 	tnode_t node;
 	tnwalk_state_t *state;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("NULL tnode_t passed in");
 		return (WALK_ERR);
 	}
@@ -896,7 +896,7 @@ tlist_walk_init(mdb_walk_state_t *wsp)
 {
 	topo_list_t tl;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("NULL topo_list_t passed in\n");
 		return (WALK_ERR);
 	}
@@ -918,7 +918,7 @@ tlist_walk_step(mdb_walk_state_t *wsp)
 	int rv;
 	topo_list_t *tl;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (topo_list_t), wsp->walk_addr) ==
diff --git a/usr/src/cmd/mdb/common/modules/libumem/libumem.c b/usr/src/cmd/mdb/common/modules/libumem/libumem.c
index d7beeb356d..18fcda181f 100644
--- a/usr/src/cmd/mdb/common/modules/libumem/libumem.c
+++ b/usr/src/cmd/mdb/common/modules/libumem/libumem.c
@@ -303,7 +303,7 @@ umastat_vmem(uintptr_t addr, const vmem_t *v, void *ignored)
 	vmem_t parent;
 	int ident = 0;
 
-	for (paddr = (uintptr_t)v->vm_source; paddr != NULL; ident += 4) {
+	for (paddr = (uintptr_t)v->vm_source; paddr != 0; ident += 4) {
 		if (mdb_vread(&parent, sizeof (parent), paddr) == -1) {
 			mdb_warn("couldn't trace %p's ancestry", addr);
 			ident = 0;
diff --git a/usr/src/cmd/mdb/common/modules/libumem/umem.c b/usr/src/cmd/mdb/common/modules/libumem/umem.c
index 43b6ea3458..d6f8f5680d 100644
--- a/usr/src/cmd/mdb/common/modules/libumem/umem.c
+++ b/usr/src/cmd/mdb/common/modules/libumem/umem.c
@@ -108,7 +108,7 @@ umem_update_variables(void)
 static int
 umem_ptc_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_layered_walk("ulwp", wsp) == -1) {
 			mdb_warn("couldn't walk 'ulwp'");
 			return (WALK_ERR);
@@ -137,7 +137,7 @@ umem_ptc_walk_step(mdb_walk_state_t *wsp)
 			return (WALK_ERR);
 		}
 
-		if (this == NULL)
+		if (this == 0)
 			break;
 
 		rval = wsp->walk_callback(this, &this, wsp->walk_cbdata);
@@ -303,7 +303,7 @@ umem_log_status(const char *name, umem_log_header_t *val)
 	uintptr_t pos = (uintptr_t)val;
 	size_t size;
 
-	if (pos == NULL)
+	if (pos == 0)
 		return;
 
 	if (mdb_vread(&my_lh, sizeof (umem_log_header_t), pos) == -1) {
@@ -516,7 +516,7 @@ umem_cpu_walk_fini(mdb_walk_state_t *wsp)
 int
 umem_cpu_cache_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("umem_cpu_cache doesn't support global walks");
 		return (WALK_ERR);
 	}
@@ -554,7 +554,7 @@ umem_slab_walk_init(mdb_walk_state_t *wsp)
 	uintptr_t caddr = wsp->walk_addr;
 	umem_cache_t c;
 
-	if (caddr == NULL) {
+	if (caddr == 0) {
 		mdb_warn("umem_slab doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -577,7 +577,7 @@ umem_slab_walk_partial_init(mdb_walk_state_t *wsp)
 	uintptr_t caddr = wsp->walk_addr;
 	umem_cache_t c;
 
-	if (caddr == NULL) {
+	if (caddr == 0) {
 		mdb_warn("umem_slab_partial doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -705,7 +705,7 @@ umem_hash_walk_init(mdb_walk_state_t *wsp)
 	size_t nelems;
 	size_t hsize;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("umem_hash doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -745,15 +745,15 @@ int
 umem_hash_walk_step(mdb_walk_state_t *wsp)
 {
 	umem_hash_walk_t *umhw = wsp->walk_data;
-	uintptr_t addr = NULL;
+	uintptr_t addr = 0;
 
-	if ((addr = (uintptr_t)umhw->umhw_cur.bc_next) == NULL) {
+	if ((addr = (uintptr_t)umhw->umhw_cur.bc_next) == 0) {
 		while (umhw->umhw_pos < umhw->umhw_nelems) {
-			if ((addr = umhw->umhw_table[umhw->umhw_pos++]) != NULL)
+			if ((addr = umhw->umhw_table[umhw->umhw_pos++]) != 0)
 				break;
 		}
 	}
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&umhw->umhw_cur, sizeof (umem_bufctl_t), addr) == -1) {
@@ -1126,7 +1126,7 @@ umem_walk_init_common(mdb_walk_state_t *wsp, int type)
 
 	type &= ~UM_HASH;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("umem walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1593,7 +1593,7 @@ umem_walk_init(mdb_walk_state_t *wsp)
 	if (wsp->walk_arg != NULL)
 		wsp->walk_addr = (uintptr_t)wsp->walk_arg;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		UMEM_WALK_ALL("umem", wsp);
 	return (umem_walk_init_common(wsp, UM_ALLOCATED));
 }
@@ -1601,7 +1601,7 @@ umem_walk_init(mdb_walk_state_t *wsp)
 int
 bufctl_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		UMEM_WALK_ALL("bufctl", wsp);
 	return (umem_walk_init_common(wsp, UM_ALLOCATED | UM_BUFCTL));
 }
@@ -1609,7 +1609,7 @@ bufctl_walk_init(mdb_walk_state_t *wsp)
 int
 freemem_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		UMEM_WALK_ALL("freemem", wsp);
 	return (umem_walk_init_common(wsp, UM_FREE));
 }
@@ -1617,7 +1617,7 @@ freemem_walk_init(mdb_walk_state_t *wsp)
 int
 freectl_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		UMEM_WALK_ALL("freectl", wsp);
 	return (umem_walk_init_common(wsp, UM_FREE | UM_BUFCTL));
 }
@@ -1636,7 +1636,7 @@ bufctl_history_walk_init(mdb_walk_state_t *wsp)
 	umem_bufctl_audit_t bc;
 	umem_bufctl_audit_t bcn;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("bufctl_history walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -1681,7 +1681,7 @@ bufctl_history_walk_step(mdb_walk_state_t *wsp)
 	umem_bufctl_audit_t *b;
 	UMEM_LOCAL_BUFCTL_AUDIT(&b);
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(b, UMEM_BUFCTL_AUDIT_SIZE, addr) == -1) {
@@ -1735,12 +1735,12 @@ umem_log_walk_init(mdb_walk_state_t *wsp)
 	 * By default (global walk), walk the umem_transaction_log.  Otherwise
 	 * read the log whose umem_log_header_t is stored at walk_addr.
 	 */
-	if (lp == NULL && umem_readvar(&lp, "umem_transaction_log") == -1) {
+	if (lp == 0 && umem_readvar(&lp, "umem_transaction_log") == -1) {
 		mdb_warn("failed to read 'umem_transaction_log'");
 		return (WALK_ERR);
 	}
 
-	if (lp == NULL) {
+	if (lp == 0) {
 		mdb_warn("log is disabled\n");
 		return (WALK_ERR);
 	}
@@ -1884,7 +1884,7 @@ allocdby_walk_init_common(mdb_walk_state_t *wsp, const char *walk)
 {
 	allocdby_walk_t *abw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("allocdby walk doesn't support global walks\n");
 		return (WALK_ERR);
 	}
@@ -2065,7 +2065,7 @@ whatis_walk_umem(uintptr_t addr, void *ignored, whatis_info_t *wi)
 	size_t size = wi->wi_cache->cache_bufsize;
 
 	while (mdb_whatis_match(w, addr, size, &cur))
-		whatis_print_umem(wi, cur, addr, NULL);
+		whatis_print_umem(wi, cur, addr, 0);
 
 	return (WHATIS_WALKRET(w));
 }
@@ -2385,7 +2385,7 @@ umem_log(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		return (DCMD_ERR);
 	}
 
-	if (lhp == NULL) {
+	if (lhp == 0) {
 		mdb_warn("no umem transaction log\n");
 		return (DCMD_ERR);
 	}
@@ -2495,8 +2495,8 @@ bufctl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	uint_t verbose = FALSE;
 	uint_t history = FALSE;
 	uint_t in_history = FALSE;
-	uintptr_t caller = NULL, thread = NULL;
-	uintptr_t laddr, haddr, baddr = NULL;
+	uintptr_t caller = 0, thread = 0;
+	uintptr_t laddr, haddr, baddr = 0;
 	hrtime_t earliest = 0, latest = 0;
 	int i, depth;
 	char c[MDB_SYM_NAMLEN];
@@ -2577,7 +2577,7 @@ bufctl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	 */
 	depth = MIN(bcp->bc_depth, umem_stack_depth);
 
-	if (caller != NULL) {
+	if (caller != 0) {
 		laddr = caller;
 		haddr = caller + sizeof (caller);
 
@@ -2600,7 +2600,7 @@ bufctl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			return (DCMD_OK);
 	}
 
-	if (thread != NULL && (uintptr_t)bcp->bc_thread != thread)
+	if (thread != 0 && (uintptr_t)bcp->bc_thread != thread)
 		return (DCMD_OK);
 
 	if (earliest != 0 && bcp->bc_timestamp < earliest)
@@ -2958,7 +2958,7 @@ vmem_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	while (vaddr != NULL) {
+	while (vaddr != 0) {
 		vp = mdb_zalloc(sizeof (vmem_node_t), UM_SLEEP);
 		vp->vn_addr = vaddr;
 		vp->vn_next = head;
@@ -2977,7 +2977,7 @@ vmem_walk_init(mdb_walk_state_t *wsp)
 
 	for (vp = head; vp != NULL; vp = vp->vn_next) {
 
-		if ((paddr = (uintptr_t)vp->vn_vmem.vm_source) == NULL) {
+		if ((paddr = (uintptr_t)vp->vn_vmem.vm_source) == 0) {
 			vp->vn_sibling = root;
 			root = vp;
 			continue;
@@ -3126,7 +3126,7 @@ vmem_seg_walk_common_init(mdb_walk_state_t *wsp, uint8_t type, char *name)
 {
 	vmem_seg_walk_t *vsw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("vmem_%s does not support global walks\n", name);
 		return (WALK_ERR);
 	}
@@ -3242,7 +3242,7 @@ vmem(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		return (DCMD_ERR);
 	}
 
-	for (paddr = (uintptr_t)v.vm_source; paddr != NULL; ident += 2) {
+	for (paddr = (uintptr_t)v.vm_source; paddr != 0; ident += 2) {
 		if (mdb_vread(&parent, sizeof (parent), paddr) == -1) {
 			mdb_warn("couldn't trace %p's ancestry", addr);
 			ident = 0;
@@ -3310,7 +3310,7 @@ vmem_seg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	int depth;
 	uintptr_t laddr, haddr;
 
-	uintptr_t caller = NULL, thread = NULL;
+	uintptr_t caller = 0, thread = 0;
 	uintptr_t minsize = 0, maxsize = 0;
 
 	hrtime_t earliest = 0, latest = 0;
@@ -3392,11 +3392,10 @@ vmem_seg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	    (depth == 0 || depth > VMEM_STACK_DEPTH);
 
 	if (no_debug) {
-		if (caller != NULL || thread != NULL || earliest != 0 ||
-		    latest != 0)
+		if (caller != 0 || thread != 0 || earliest != 0 || latest != 0)
 			return (DCMD_OK);		/* not enough info */
 	} else {
-		if (caller != NULL) {
+		if (caller != 0) {
 			laddr = caller;
 			haddr = caller + sizeof (caller);
 
@@ -3420,7 +3419,7 @@ vmem_seg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 				return (DCMD_OK);
 		}
 
-		if (thread != NULL && (uintptr_t)vs.vs_thread != thread)
+		if (thread != 0 && (uintptr_t)vs.vs_thread != thread)
 			return (DCMD_OK);
 
 		if (earliest != 0 && vs.vs_timestamp < earliest)
diff --git a/usr/src/cmd/mdb/common/modules/lofs/lofs.c b/usr/src/cmd/mdb/common/modules/lofs/lofs.c
index f441040ea6..e774dc58ac 100644
--- a/usr/src/cmd/mdb/common/modules/lofs/lofs.c
+++ b/usr/src/cmd/mdb/common/modules/lofs/lofs.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/vfs.h>
 #include <sys/fs/lofs_node.h>
@@ -54,7 +52,7 @@ lnode_walk_init(mdb_walk_state_t *wsp)
 		return (WALK_ERR);
 	}
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		uintptr_t rootvfsp, vfsp;
 		uint_t htsize;
 
@@ -159,7 +157,7 @@ lnode_walk_step(mdb_walk_state_t *wsp)
 	 * If the next lnode_t address we want is NULL, advance to the next
 	 * hash bucket.  When we reach lw_tabsz, we're done.
 	 */
-	while (wsp->walk_addr == NULL) {
+	while (wsp->walk_addr == 0) {
 		if (++lwp->lw_tabi < lwp->lw_tabsz)
 			wsp->walk_addr =
 			    (uintptr_t)lwp->lw_table[lwp->lw_tabi].lh_chain;
diff --git a/usr/src/cmd/mdb/common/modules/mac/mac.c b/usr/src/cmd/mdb/common/modules/mac/mac.c
index 66ba2e9f3c..d42066a37d 100644
--- a/usr/src/cmd/mdb/common/modules/mac/mac.c
+++ b/usr/src/cmd/mdb/common/modules/mac/mac.c
@@ -235,7 +235,7 @@ mac_flow_dcmd_output(uintptr_t addr, uint_t flags, uint_t args)
 		break;
 	}
 	case MAC_FLOW_ATTR: {
-		struct 	in_addr	in4;
+		struct	in_addr	in4;
 		uintptr_t	desc_addr;
 		flow_desc_t	fdesc;
 
@@ -283,7 +283,7 @@ mac_flow_dcmd_output(uintptr_t addr, uint_t flags, uint_t args)
 	case MAC_FLOW_MISC: {
 		char		flow_flags[2 * FLOW_MAX_FLAGS];
 		char		flow_type[2 * FLOW_MAX_TYPE];
-		GElf_Sym 	sym;
+		GElf_Sym	sym;
 		char		func_name[MDB_SYM_NAMLEN] = "";
 		uintptr_t	func, match_addr;
 
@@ -325,8 +325,8 @@ mac_flow_dcmd_output(uintptr_t addr, uint_t flags, uint_t args)
 		break;
 	}
 	case MAC_FLOW_STATS: {
-		uint64_t  		totibytes = 0;
-		uint64_t  		totobytes = 0;
+		uint64_t		totibytes = 0;
+		uint64_t		totobytes = 0;
 		mac_soft_ring_set_t	*mac_srs;
 		mac_rx_stats_t		mac_rx_stat;
 		mac_tx_stats_t		mac_tx_stat;
@@ -472,7 +472,7 @@ mac_common_walk_step(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
@@ -1043,7 +1043,7 @@ mac_group_walk_init(mdb_walk_state_t *wsp)
 {
 	int ret;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("non-global walks are not supported\n");
 		return (WALK_ERR);
 	}
@@ -1069,7 +1069,7 @@ mac_group_walk_step(mdb_walk_state_t *wsp)
 	 * walkers are a bit unsporting, they don't actually read in the data
 	 * for us.
 	 */
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&mi, sizeof (mac_impl_t), wsp->walk_addr) == -1) {
@@ -1081,7 +1081,7 @@ mac_group_walk_step(mdb_walk_state_t *wsp)
 	 * First go for rx groups, then tx groups.
 	 */
 	mgp = (uintptr_t)mi.mi_rx_groups;
-	while (mgp != NULL) {
+	while (mgp != 0) {
 		if (mdb_vread(&mg, sizeof (mac_group_t), mgp) == -1) {
 			mdb_warn("failed to read mac_group_t at %p", mgp);
 			return (WALK_ERR);
@@ -1094,7 +1094,7 @@ mac_group_walk_step(mdb_walk_state_t *wsp)
 	}
 
 	mgp = (uintptr_t)mi.mi_tx_groups;
-	while (mgp != NULL) {
+	while (mgp != 0) {
 		if (mdb_vread(&mg, sizeof (mac_group_t), mgp) == -1) {
 			mdb_warn("failed to read mac_group_t at %p", mgp);
 			return (WALK_ERR);
@@ -1115,7 +1115,7 @@ mac_group_count_clients(mac_group_t *mgp)
 	int clients = 0;
 	uintptr_t mcp = (uintptr_t)mgp->mrg_clients;
 
-	while (mcp != NULL) {
+	while (mcp != 0) {
 		mac_grp_client_t c;
 
 		if (mdb_vread(&c, sizeof (c), mcp) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c b/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
index f600e5c9b1..34df6a578a 100644
--- a/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
+++ b/usr/src/cmd/mdb/common/modules/mdb_ds/mdb_ds.c
@@ -383,7 +383,7 @@ cmd_wr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 			dpth.dpth_path++;
 
-			if (pathp == NULL)
+			if (pathp == 0)
 				break;
 
 			if (mdb_readstr(path, sizeof (path), pathp) < 0) {
@@ -427,7 +427,7 @@ iob_stack_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	mdb_iob_t iob;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&iob, sizeof (iob), addr) == -1) {
@@ -442,7 +442,7 @@ iob_stack_walk_step(mdb_walk_state_t *wsp)
 static int
 frame_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		wsp->walk_addr = (uintptr_t)get_mdb()->m_flist.ml_prev;
 
 	return (WALK_NEXT);
@@ -454,7 +454,7 @@ frame_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	mdb_frame_t f;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&f, sizeof (f), addr) == -1) {
@@ -469,7 +469,7 @@ frame_walk_step(mdb_walk_state_t *wsp)
 static int
 target_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		wsp->walk_addr = (uintptr_t)get_mdb()->m_target;
 
 	return (WALK_NEXT);
@@ -481,7 +481,7 @@ target_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	mdb_tgt_t t;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&t, sizeof (t), addr) == -1) {
@@ -499,7 +499,7 @@ sespec_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	mdb_sespec_t s;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&s, sizeof (s), addr) == -1) {
@@ -517,7 +517,7 @@ vespec_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	mdb_vespec_t v;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&v, sizeof (v), addr) == -1) {
@@ -535,7 +535,7 @@ se_matched_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t addr = wsp->walk_addr;
 	mdb_sespec_t s;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&s, sizeof (s), addr) == -1) {
@@ -597,7 +597,7 @@ _mdb_init(void)
 		    "implementation (mdb_t mismatch)\n");
 	}
 
-	if (mdb_readvar(&addr, "_mdb_abort_str") != -1 && addr != NULL &&
+	if (mdb_readvar(&addr, "_mdb_abort_str") != -1 && addr != 0 &&
 	    mdb_readstr(buf, sizeof (buf), addr) > 0)
 		mdb_printf("mdb: debugger failed with error: %s\n", buf);
 
diff --git a/usr/src/cmd/mdb/common/modules/mdb_ks/mdb_ks.c b/usr/src/cmd/mdb/common/modules/mdb_ks/mdb_ks.c
index a801d4d39f..d4b817295d 100644
--- a/usr/src/cmd/mdb/common/modules/mdb_ks/mdb_ks.c
+++ b/usr/src/cmd/mdb/common/modules/mdb_ks/mdb_ks.c
@@ -508,7 +508,7 @@ mdb_vnode2path(uintptr_t addr, char *buf, size_t buflen)
 
 	bzero(&path, sizeof (mdb_path_t));
 again:
-	if ((addr == NULL) && (path.mdp_nelem == 0)) {
+	if ((addr == 0) && (path.mdp_nelem == 0)) {
 		/*
 		 * 0 elems && complete tells sprintpath to just print "/"
 		 */
@@ -666,7 +666,7 @@ mdb_page_lookup(uintptr_t vp, u_offset_t offset)
 	uintptr_t page_hash_entry, pp;
 
 	if (!page_hash_loaded && !page_hash_load()) {
-		return (NULL);
+		return (0);
 	}
 
 	ndx = PAGE_HASH_FUNC(vp, offset);
@@ -675,16 +675,16 @@ mdb_page_lookup(uintptr_t vp, u_offset_t offset)
 	if (mdb_vread(&pp, sizeof (pp), page_hash_entry) < 0) {
 		mdb_warn("unable to read page_hash[%ld] (%p)", ndx,
 		    page_hash_entry);
-		return (NULL);
+		return (0);
 	}
 
-	while (pp != NULL) {
+	while (pp != 0) {
 		page_t page;
 		long nndx;
 
 		if (mdb_vread(&page, sizeof (page), pp) < 0) {
 			mdb_warn("unable to read page_t at %p", pp);
-			return (NULL);
+			return (0);
 		}
 
 		if ((uintptr_t)page.p_vnode == vp &&
@@ -704,13 +704,13 @@ mdb_page_lookup(uintptr_t vp, u_offset_t offset)
 			mdb_warn("mdb_page_lookup: mdb_ks PAGE_HASH_FUNC() "
 			    "mismatch: in bucket %ld, but page %p hashes to "
 			    "bucket %ld\n", ndx, pp, nndx);
-			return (NULL);
+			return (0);
 		}
 
 		pp = (uintptr_t)page.p_hash;
 	}
 
-	return (NULL);
+	return (0);
 }
 
 char
@@ -837,7 +837,7 @@ mdb_addr2modctl(uintptr_t addr)
 	a2m_query_t a2m;
 
 	a2m.a2m_addr = addr;
-	a2m.a2m_where = NULL;
+	a2m.a2m_where = 0;
 
 	(void) mdb_walk("modctl", (mdb_walk_cb_t)a2m_walk_modctl, &a2m);
 	return (a2m.a2m_where);
@@ -938,7 +938,7 @@ mdb_qrnext(const queue_t *q)
 	if (qip != NULL)
 		return (qip->qi_ops->q_rnext(q));
 
-	return (NULL);
+	return (0);
 }
 
 uintptr_t
@@ -949,7 +949,7 @@ mdb_qwnext(const queue_t *q)
 	if (qip != NULL)
 		return (qip->qi_ops->q_wnext(q));
 
-	return (NULL);
+	return (0);
 }
 
 uintptr_t
@@ -992,13 +992,13 @@ find_mbind(const char *name, uintptr_t *hashtab)
 	while (mb) {
 		if (mdb_vread(&mb_local, sizeof (mb_local), mb) == -1) {
 			mdb_warn("failed to read struct bind at %p", mb);
-			return (NULL);
+			return (0);
 		}
 		if (mdb_readstr(node_name, sizeof (node_name),
 		    (uintptr_t)mb_local.b_name) == -1) {
 			mdb_warn("failed to read node name string at %p",
 			    mb_local.b_name);
-			return (NULL);
+			return (0);
 		}
 
 		if (strcmp(name, node_name) == 0)
@@ -1014,7 +1014,7 @@ mdb_name_to_major(const char *name, major_t *major)
 {
 	uintptr_t	mbind;
 	uintptr_t	mb_hashtab[MOD_BIND_HASHSIZE];
-	struct bind 	mbind_local;
+	struct bind	mbind_local;
 
 
 	if (mdb_readsym(mb_hashtab, sizeof (mb_hashtab), "mb_hashtab") == -1) {
@@ -1022,7 +1022,7 @@ mdb_name_to_major(const char *name, major_t *major)
 		return (-1);
 	}
 
-	if ((mbind = find_mbind(name, mb_hashtab)) != NULL) {
+	if ((mbind = find_mbind(name, mb_hashtab)) != 0) {
 		if (mdb_vread(&mbind_local, sizeof (mbind_local), mbind) ==
 		    -1) {
 			mdb_warn("failed to read mbind struct at %p", mbind);
@@ -1276,7 +1276,7 @@ mdb_kproc_as(uintptr_t proc_addr)
 	if (mdb_vread(&p, sizeof (p), proc_addr) == sizeof (p))
 		return ((uintptr_t)p.p_as);
 
-	return (NULL);
+	return (0);
 }
 
 /*
@@ -1431,11 +1431,11 @@ mdb_dump_print_content(dumphdr_t *dh, pid_t content)
 	if (!(expcont & DF_CURPROC))
 		return;
 
-	if (mdb_readvar(&pt, "panic_thread") != sizeof (pt) || pt == NULL)
+	if (mdb_readvar(&pt, "panic_thread") != sizeof (pt) || pt == 0)
 		goto kthreadpanic_err;
 
 	if (mdb_vread(&procp, sizeof (procp), pt + OFFSETOF(kthread_t,
-	    t_procp)) == -1 || procp == NULL)
+	    t_procp)) == -1 || procp == 0)
 		goto kthreadpanic_err;
 
 	if (mdb_lookup_by_name("p0", &sym) != 0)
@@ -1490,7 +1490,7 @@ mdb_ddi_root_node(void)
 	/* return (top_devinfo);   */
 	if (mdb_readvar(&top_devinfo_addr, "top_devinfo") == -1) {
 		mdb_warn("failed to read top_devinfo");
-		return (NULL);
+		return (0);
 	}
 	return (top_devinfo_addr);
 }
@@ -1545,7 +1545,7 @@ mdb_ddi_deviname(uintptr_t dip_addr, char *name, size_t name_size)
 	local_name_size -= length;
 	addrname = (uintptr_t)local_dip.devi_addr;
 
-	if (addrname != NULL) {
+	if (addrname != 0) {
 
 		if (local_name_size < 2) {
 			mdb_warn("not enough room for node address string");
diff --git a/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c b/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
index fe63ea02e2..ecb2aba4cc 100644
--- a/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
+++ b/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
@@ -119,7 +119,7 @@ mdi_info_cb(uintptr_t addr, const void *data, void *cbdata)
 		return (-1);
 	}
 
-	*dev_path = NULL;
+	*dev_path = '\0';
 	if (construct_path((uintptr_t)c.ct_dip, dev_path) != DCMD_OK)
 		strcpy(dev_path, "unknown");
 
@@ -227,7 +227,7 @@ klist_head(list_t *lp, uintptr_t klp)
 {
 	if ((uintptr_t)lp->list_head.list_next ==
 	    klp + offsetof(struct list, list_head))
-		return (NULL);
+		return (0);
 
 	return ((uintptr_t)(((char *)lp->list_head.list_next) -
 	    lp->list_offset));
@@ -241,7 +241,7 @@ klist_next(list_t *lp, uintptr_t klp, void *op)
 	    lp->list_offset);
 
 	if ((uintptr_t)np->list_next == klp + offsetof(struct list, list_head))
-		return (NULL);
+		return (0);
 
 	return (((uintptr_t)(np->list_next)) - lp->list_offset);
 }
@@ -284,7 +284,7 @@ krefhash_next(uintptr_t khp, void *op, uintptr_t *addr)
 	lp = (refhash_link_t *)(((char *)(op)) + mh.rh_link_off);
 	ml = *lp;
 	while ((klp = klist_next(&mh.rh_objs,
-	    khp + offsetof(refhash_t, rh_objs), &ml)) != NULL) {
+	    khp + offsetof(refhash_t, rh_objs), &ml)) != 0) {
 		mdb_vread(&ml, sizeof (ml), klp);
 		if (!(ml.rhl_flags & RHL_F_DEAD))
 			break;
@@ -474,7 +474,7 @@ display_slotinfo(struct mptsas *mp, struct mptsas_slots *s)
 		return (DCMD_ERR);
 	}
 
-	if (state != MDB_STATE_STOPPED && panicstr == NULL) {
+	if (state != MDB_STATE_STOPPED && panicstr == 0) {
 		mdb_warn("mptsas: slot info not available for live dump\n");
 		return (DCMD_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c b/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c
index a1ce03833f..3b350a19ba 100644
--- a/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c
+++ b/usr/src/cmd/mdb/common/modules/nsmb/nsmb.c
@@ -85,7 +85,7 @@ smb_co_walk_init(mdb_walk_state_t *wsp, int level)
 	smb_co_walk_data_t *smbw;
 	size_t psz;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	smbw = mdb_alloc(sizeof (*smbw), UM_SLEEP | UM_GC);
@@ -140,7 +140,7 @@ smb_vc_walk_init(mdb_walk_state_t *wsp)
 {
 	GElf_Sym sym;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("::walk smb_vc only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -183,7 +183,7 @@ smb_co_walk_step(mdb_walk_state_t *wsp)
 	smb_co_walk_data_t *smbw = wsp->walk_data;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&smbw->u, smbw->size, wsp->walk_addr)
@@ -390,7 +390,7 @@ rqlist_walk_step(mdb_walk_state_t *wsp)
 	smb_rq_t rq;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&rq, sizeof (rq), wsp->walk_addr) == -1) {
@@ -466,7 +466,7 @@ pwtree_walk_init(mdb_walk_state_t *wsp)
 {
 	GElf_Sym sym;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("pwtree walk only supports global walks\n");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c b/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
index ddd42cf781..f88400048e 100644
--- a/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
+++ b/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
@@ -228,7 +228,7 @@ display_iport_damap(dev_info_t *pdip)
 	mdb_vread(&dam1, sizeof (dam1),
 	    (uintptr_t)(sizeof (dam0) + tmd_offset + (char *)sht.tran_tgtmap));
 
-	if (dam0 != NULL) {
+	if (dam0 != 0) {
 		rval = mdb_call_dcmd("damap", dam0, DCMD_ADDRSPEC, 0, NULL);
 		mdb_printf("\n");
 		if (rval != DCMD_OK) {
@@ -236,7 +236,7 @@ display_iport_damap(dev_info_t *pdip)
 		}
 	}
 
-	if (dam1 != NULL) {
+	if (dam1 != 0) {
 		rval = mdb_call_dcmd("damap", dam1, DCMD_ADDRSPEC, 0, NULL);
 		mdb_printf("\n");
 	}
@@ -1545,7 +1545,7 @@ get_devid_from_ob_iomb(struct pmcs_hw ss, uint32_t *qentryp, uint16_t opcode)
 		/*
 		 * If we have a PHY, read it in and get it's handle
 		 */
-		if (_phy != NULL) {
+		if (_phy != 0) {
 			if (MDB_RD(phy, sizeof (*phy), _phy) == -1) {
 				NOREAD(pmcs_phy_t, phy);
 			} else {
@@ -1741,7 +1741,7 @@ display_outbound_queues(struct pmcs_hw ss, uint64_t devid_filter,
 	for (qidx = 0; qidx < PMCS_NOQ; qidx++) {
 		obqp = (uintptr_t)ss.oqp[qidx];
 
-		if (obqp == NULL) {
+		if (obqp == 0) {
 			mdb_printf("No outbound queue ptr for queue #%d\n",
 			    qidx);
 			continue;
@@ -1873,7 +1873,7 @@ display_inbound_queues(struct pmcs_hw ss, uint64_t devid_filter, uint_t verbose)
 	for (qidx = 0; qidx < PMCS_NIQ; qidx++) {
 		ibqp = (uintptr_t)ss.iqp[qidx];
 
-		if (ibqp == NULL) {
+		if (ibqp == 0) {
 			mdb_printf("No inbound queue ptr for queue #%d\n",
 			    qidx);
 			continue;
@@ -2367,7 +2367,7 @@ pmcs_dump_tracelog(boolean_t filter, int instance, uint64_t tail_lines,
 static int
 targets_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Can not perform global walk\n");
 		return (WALK_ERR);
 	}
@@ -2418,7 +2418,7 @@ targets_walk_s(mdb_walk_state_t *wsp)
 
 	do {
 		wsp->walk_addr = (uintptr_t)(targets[++target_idx]);
-	} while ((wsp->walk_addr == NULL) && (target_idx < ss.max_dev));
+	} while ((wsp->walk_addr == 0) && (target_idx < ss.max_dev));
 
 	if (target_idx == ss.max_dev) {
 		return (WALK_DONE);
@@ -2478,7 +2478,7 @@ pmcs_next_sibling(pmcs_phy_t *phyp)
 static int
 phy_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Can not perform global walk\n");
 		return (WALK_ERR);
 	}
@@ -2522,7 +2522,7 @@ phy_walk_s(mdb_walk_state_t *wsp)
 		wsp->walk_addr = (uintptr_t)(phyp->sibling);
 	}
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		/*
 		 * We reached the end of this sibling list.  Trudge back up
 		 * to the parent and find the next sibling after the expander
@@ -2856,7 +2856,7 @@ pmcs_log(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	struct pmcs_hw	ss;
 	struct dev_info	dip;
 	const char	*match_phy_path = NULL;
-	uint64_t 	match_sas_address = 0, tail_lines = 0;
+	uint64_t	match_sas_address = 0, tail_lines = 0;
 	uint_t		verbose = 0;
 
 	if (!(flags & DCMD_ADDRSPEC)) {
diff --git a/usr/src/cmd/mdb/common/modules/ptm/ptm.c b/usr/src/cmd/mdb/common/modules/ptm/ptm.c
index 3b5012f767..da9b125308 100644
--- a/usr/src/cmd/mdb/common/modules/ptm/ptm.c
+++ b/usr/src/cmd/mdb/common/modules/ptm/ptm.c
@@ -213,7 +213,7 @@ ptms_walk_init(mdb_walk_state_t *wsp)
 {
 	size_t nslots;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("ptms supports only global walks");
 		return (WALK_ERR);
 	}
@@ -253,7 +253,7 @@ ptms_walk_step(mdb_walk_state_t *wsp)
 		return (WALK_DONE);
 	}
 
-	if (ptr == NULL) {
+	if (ptr == 0) {
 		wsp->walk_addr += sizeof (uintptr_t);
 		return (WALK_NEXT);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/qlc/qlc.c b/usr/src/cmd/mdb/common/modules/qlc/qlc.c
index 5d812d8eba..88bb0adaf2 100644
--- a/usr/src/cmd/mdb/common/modules/qlc/qlc.c
+++ b/usr/src/cmd/mdb/common/modules/qlc/qlc.c
@@ -259,7 +259,7 @@ qlclinks_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	ql_head_t		ql_hba;
 	ql_adapter_state_t	*qlstate;
-	uintptr_t		hbaptr = NULL;
+	uintptr_t		hbaptr = 0;
 
 	if ((flags & DCMD_ADDRSPEC) || argc != 0) {
 		return (DCMD_USAGE);
@@ -288,7 +288,7 @@ qlclinks_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	mdb_printf("%<u>%-?s\t%-45s%</u>\n\n", "baseaddr", "instance");
 
 	hbaptr = (uintptr_t)ql_hba.first;
-	while (hbaptr != NULL) {
+	while (hbaptr != 0) {
 
 		if (mdb_vread(qlstate, sizeof (ql_adapter_state_t),
 		    hbaptr) == -1) {
@@ -309,7 +309,7 @@ qlclinks_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		    (qlstate->vp_next != NULL)) {
 
 			ql_adapter_state_t	*vqlstate;
-			uintptr_t		vhbaptr = NULL;
+			uintptr_t		vhbaptr = 0;
 
 			vhbaptr = (uintptr_t)qlstate->vp_next;
 
@@ -325,7 +325,7 @@ qlclinks_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 			mdb_printf("%<u>vp baseaddr\t\tvp index%</u>\n");
 
-			while (vhbaptr != NULL) {
+			while (vhbaptr != 0) {
 
 				if (mdb_vread(vqlstate,
 				    sizeof (ql_adapter_state_t), vhbaptr) ==
@@ -415,7 +415,7 @@ qlcver_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		mdb_warn("unable to read firmware table\n");
 	} else {
 		ql_adapter_state_t	*qlstate;
-		uintptr_t		hbaptr = NULL;
+		uintptr_t		hbaptr = 0;
 
 		if (mdb_readvar(&ql_hba, "ql_hba") == -1) {
 			mdb_warn("failed to read ql_hba structure");
@@ -447,13 +447,13 @@ qlcver_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 			if (&ql_hba == NULL) {
 				mdb_warn("failed to read ql_hba structure");
-				hbaptr = NULL;
+				hbaptr = 0;
 			} else {
 				hbaptr = (uintptr_t)ql_hba.first;
 			}
 
 			found = 0;
-			while (hbaptr != NULL) {
+			while (hbaptr != 0) {
 
 				if (mdb_vread(qlstate,
 				    sizeof (ql_adapter_state_t), hbaptr) ==
@@ -525,7 +525,7 @@ qlc_el_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	uint32_t		instance;
 	uint32_t		qlsize = sizeof (ql_adapter_state_t);
 	ql_adapter_state_t	*qlstate;
-	uintptr_t		hbaptr = NULL;
+	uintptr_t		hbaptr = 0;
 	ql_head_t		ql_hba;
 
 	if ((mdbs = mdb_get_state()) == MDB_STATE_DEAD) {
@@ -590,7 +590,7 @@ qlc_el_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 		hbaptr = (uintptr_t)ql_hba.first;
 
-		while (hbaptr != NULL) {
+		while (hbaptr != 0) {
 
 			if (mdb_vread(qlstate, qlsize, hbaptr) == -1) {
 				mdb_free(qlstate, qlsize);
@@ -611,7 +611,7 @@ qlc_el_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 			/* find the correct instance to change */
 			hbaptr = (uintptr_t)ql_hba.first;
-			while (hbaptr != NULL) {
+			while (hbaptr != 0) {
 
 				if (mdb_vread(qlstate, qlsize, hbaptr) == -1) {
 					mdb_free(qlstate, qlsize);
@@ -627,7 +627,7 @@ qlc_el_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 				hbaptr = (uintptr_t)qlstate->hba.next;
 			}
 
-			if (hbaptr == NULL) {
+			if (hbaptr == 0) {
 				mdb_printf("instance %d is not loaded",
 				    instance);
 				continue;
@@ -1154,7 +1154,7 @@ qlstates_walk_init(mdb_walk_state_t *wsp)
 {
 	ql_head_t	ql_hba;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if ((mdb_readvar(&ql_hba, "ql_hba") == -1) ||
 		    (&ql_hba == NULL)) {
 			mdb_warn("failed to read ql_hba structure");
@@ -1189,7 +1189,7 @@ qlstates_walk_step(mdb_walk_state_t *wsp)
 {
 	ql_adapter_state_t	*qlstate;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -1259,7 +1259,7 @@ qlstates_walk_fini(mdb_walk_state_t *wsp)
 static int
 qlsrb_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("failed to read ql_srb addr at %p",
 		    wsp->walk_addr);
 		return (WALK_ERR);
@@ -1289,7 +1289,7 @@ qlsrb_walk_step(mdb_walk_state_t *wsp)
 {
 	ql_srb_t	*qlsrb;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (ql_srb_t),
@@ -1351,7 +1351,7 @@ qlsrb_walk_fini(mdb_walk_state_t *wsp)
 static int
 qllunq_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("failed to read ql_lun addr at %p",
 		    wsp->walk_addr);
 		return (WALK_ERR);
@@ -1383,7 +1383,7 @@ qllunq_walk_step(mdb_walk_state_t *wsp)
 	ql_link_t	ql_link;
 	ql_link_t	*qllink;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (ql_lun_t),
@@ -1472,7 +1472,7 @@ qltgtq_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	uint32_t		index;
 	ql_head_t		*dev;
 
-	if ((!(flags & DCMD_ADDRSPEC)) || addr == NULL) {
+	if ((!(flags & DCMD_ADDRSPEC)) || addr == 0) {
 		mdb_warn("ql_hba structure addr is required");
 		return (DCMD_USAGE);
 	}
@@ -1733,10 +1733,10 @@ qlc_getdump_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	ql_adapter_state_t	*ha;
 	ql_head_t		ql_hba;
-	uintptr_t		hbaptr = NULL;
+	uintptr_t		hbaptr = 0;
 	int			verbose = 0;
 
-	if ((!(flags & DCMD_ADDRSPEC)) || addr == NULL) {
+	if ((!(flags & DCMD_ADDRSPEC)) || addr == 0) {
 		mdb_warn("ql_adapter_state structure addr is required");
 		return (DCMD_USAGE);
 	}
@@ -1765,7 +1765,7 @@ qlc_getdump_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		mdb_warn("failed to read ql_hba structure -- is qlc loaded?");
 	} else if (verbose) {
 		hbaptr = (uintptr_t)ql_hba.first;
-		while (hbaptr != NULL) {
+		while (hbaptr != 0) {
 
 			if (mdb_vread(ha, sizeof (ql_adapter_state_t),
 			    hbaptr) == -1) {
@@ -3188,7 +3188,7 @@ qlc_gettrace_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	char			*dump_current  = 0;
 	el_trace_desc_t		*trace_desc;
 
-	if ((!(flags & DCMD_ADDRSPEC)) || addr == NULL) {
+	if ((!(flags & DCMD_ADDRSPEC)) || addr == 0) {
 		mdb_warn("ql_adapter_state structure addr is required");
 		return (DCMD_USAGE);
 	}
@@ -3270,7 +3270,7 @@ qlc_gettrace_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if ((trace_next + EL_BUFFER_RESERVE) >= trace_end) {
 		dump_start = trace_start;
-	} else if (*trace_next != NULL) {
+	} else if (*trace_next != '\0') {
 		dump_start = trace_next + (strlen(trace_next) + 1);
 	} else {
 		dump_start = trace_start;
@@ -3300,7 +3300,7 @@ qlc_gettrace_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 				mdb_printf("Done %x", dump_current);
 				break;
 			}
-		} else if (*dump_current == NULL) {
+		} else if (*dump_current == '\0') {
 			mdb_printf("Done %x(null)", dump_current);
 			break;
 		}
diff --git a/usr/src/cmd/mdb/common/modules/s1394/s1394.c b/usr/src/cmd/mdb/common/modules/s1394/s1394.c
index 26e110e547..f9398fcdd9 100644
--- a/usr/src/cmd/mdb/common/modules/s1394/s1394.c
+++ b/usr/src/cmd/mdb/common/modules/s1394/s1394.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/mdb_modapi.h>
 #include <sys/dditypes.h>
 #include <sys/sysinfo.h>
@@ -66,7 +64,7 @@ speedmap_walk_init(mdb_walk_state_t *wsp)
 	s1394_state_t	*statep;
 	s1394_state_t	state;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&statep, "s1394_statep") == -1) {
 			mdb_warn("failed to find the s1394_statep pointer");
 			return (WALK_ERR);
@@ -88,7 +86,7 @@ speedmap_walk_step(mdb_walk_state_t *wsp)
 	s1394_hal_t	hal;
 	uintptr_t	addr = wsp->walk_addr;
 
-	if (addr == NULL)
+	if (addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&hal, sizeof (s1394_hal_t), addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/sctp/sctp.c b/usr/src/cmd/mdb/common/modules/sctp/sctp.c
index 5901efcab8..65f3bf11e6 100644
--- a/usr/src/cmd/mdb/common/modules/sctp/sctp.c
+++ b/usr/src/cmd/mdb/common/modules/sctp/sctp.c
@@ -387,7 +387,7 @@ sctp_istr_msgs(uintptr_t addr, uint_t flags, int ac, const mdb_arg_t *av)
 {
 	mblk_t			istrmp;
 	mblk_t			dmp;
-	sctp_data_hdr_t 	dp;
+	sctp_data_hdr_t		dp;
 	uintptr_t		daddr;
 	uintptr_t		chaddr;
 	boolean_t		bbit;
@@ -419,10 +419,10 @@ sctp_istr_msgs(uintptr_t addr, uint_t flags, int ac, const mdb_arg_t *av)
 
 
 			daddr = (uintptr_t)dmp.b_cont;
-		} while (daddr != NULL);
+		} while (daddr != 0);
 
 		addr = (uintptr_t)istrmp.b_next;
-	} while (addr != NULL);
+	} while (addr != 0);
 
 	return (DCMD_OK);
 }
@@ -475,10 +475,10 @@ sctp_reass_list(uintptr_t addr, uint_t flags, int ac, const mdb_arg_t *av)
 			    dp.sdh_tsn, bbit, ebit);
 
 			daddr = (uintptr_t)dmp.b_cont;
-		} while (daddr != NULL);
+		} while (daddr != 0);
 
 		addr = (uintptr_t)srpmp.b_next;
-	} while (addr != NULL);
+	} while (addr != 0);
 
 	return (DCMD_OK);
 }
@@ -517,7 +517,7 @@ sctp_uo_reass_list(uintptr_t addr, uint_t flags, int ac, const mdb_arg_t *av)
 		    dp.sdh_tsn, dp.sdh_flags, ubit, bbit, ebit);
 
 		addr = (uintptr_t)dmp.b_next;
-	} while (addr != NULL);
+	} while (addr != 0);
 
 	return (DCMD_OK);
 }
@@ -1048,21 +1048,21 @@ bind_size(sctp_stack_t *sctps)
 	return (SCTP_BIND_FANOUT_SIZE);
 }
 
-static intptr_t
+static uintptr_t
 find_next_hash_item(fanout_walk_data_t *fw)
 {
 	sctp_tf_t tf;
 	sctp_t sctp;
 
 	/* first try to continue down the hash chain */
-	if (fw->sctp != NULL) {
+	if (fw->sctp != 0) {
 		/* try to get next in hash chain */
 		if (mdb_vread(&sctp, sizeof (sctp), fw->sctp) == -1) {
 			mdb_warn("failed to read sctp at %p", fw->sctp);
-			return (NULL);
+			return (0);
 		}
 		fw->sctp = fw->getnext(&sctp);
-		if (fw->sctp != NULL)
+		if (fw->sctp != 0)
 			return (fw->sctp);
 		else
 			/* end of chain; go to next bucket */
@@ -1076,7 +1076,7 @@ find_next_hash_item(fanout_walk_data_t *fw)
 		    (uintptr_t)(fw->fanout + fw->index)) == -1) {
 			mdb_warn("failed to read tf at %p",
 			    fw->fanout + fw->index);
-			return (NULL);
+			return (0);
 		}
 		if (tf.tf_sctp != NULL) {
 			/* start of a new chain */
@@ -1084,7 +1084,7 @@ find_next_hash_item(fanout_walk_data_t *fw)
 			return (fw->sctp);
 		}
 	}
-	return (NULL);
+	return (0);
 }
 
 static int
@@ -1105,11 +1105,11 @@ fanout_stack_walk_init(mdb_walk_state_t *wsp)
 	lw = mdb_alloc(sizeof (*lw), UM_SLEEP);
 	lw->index = 0;
 	lw->size = fi->getsize(sctps);
-	lw->sctp = NULL;
+	lw->sctp = 0;
 	lw->fanout = (sctp_tf_t *)kaddr;
 	lw->getnext = fi->getnext;
 
-	if ((wsp->walk_addr = find_next_hash_item(lw)) == NULL) {
+	if ((wsp->walk_addr = find_next_hash_item(lw)) == 0) {
 		return (WALK_DONE);
 	}
 	wsp->walk_data = lw;
@@ -1133,7 +1133,7 @@ fanout_stack_walk_step(mdb_walk_state_t *wsp)
 	if (status != WALK_NEXT)
 		return (status);
 
-	if ((wsp->walk_addr = find_next_hash_item(fw)) == NULL)
+	if ((wsp->walk_addr = find_next_hash_item(fw)) == 0)
 		return (WALK_DONE);
 
 	return (WALK_NEXT);
@@ -1203,14 +1203,14 @@ sctp_walk_faddr_init(mdb_walk_state_t *wsp)
 {
 	sctp_t sctp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&sctp, sizeof (sctp), wsp->walk_addr) == -1) {
 		mdb_warn("failed to read sctp at %p", wsp->walk_addr);
 		return (WALK_ERR);
 	}
-	if ((wsp->walk_addr = (uintptr_t)sctp.sctp_faddrs) != NULL)
+	if ((wsp->walk_addr = (uintptr_t)sctp.sctp_faddrs) != 0)
 		return (WALK_NEXT);
 	else
 		return (WALK_DONE);
@@ -1230,7 +1230,7 @@ sctp_walk_faddr_step(mdb_walk_state_t *wsp)
 	status = wsp->walk_callback(faddr_ptr, &sctp_faddr, wsp->walk_cbdata);
 	if (status != WALK_NEXT)
 		return (status);
-	if ((faddr_ptr = (uintptr_t)sctp_faddr.sf_next) == NULL) {
+	if ((faddr_ptr = (uintptr_t)sctp_faddr.sf_next) == 0) {
 		return (WALK_DONE);
 	} else {
 		wsp->walk_addr = faddr_ptr;
@@ -1256,7 +1256,7 @@ sctp_walk_saddr_init(mdb_walk_state_t *wsp)
 	int i;
 	saddr_walk_t *swalker;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	swalker = mdb_alloc(sizeof (saddr_walk_t), UM_SLEEP);
@@ -1402,7 +1402,7 @@ sctp_stack_ill_walk_init(mdb_walk_state_t *wsp)
 	}
 	if (mdb_vread(&iw.ills, sizeof (iw.ills), kaddr) == -1) {
 		mdb_warn("failed to read 'sctps_g_ills'");
-		return (NULL);
+		return (0);
 	}
 
 	/* Find the first ill. */
@@ -1474,7 +1474,7 @@ sctp_stack_ipif_walk_init(mdb_walk_state_t *wsp)
 	}
 	if (mdb_vread(&iw.ipifs, sizeof (iw.ipifs), kaddr) == -1) {
 		mdb_warn("failed to read 'sctps_g_ipifs'");
-		return (NULL);
+		return (0);
 	}
 
 	/* Find the first ipif. */
@@ -1509,7 +1509,7 @@ sctps_sc_walk_init(mdb_walk_state_t *wsp)
 {
 	sctp_stack_t sctps;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_ERR);
 
 	if (mdb_vread(&sctps, sizeof (sctps), wsp->walk_addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/sd/sd.c b/usr/src/cmd/mdb/common/modules/sd/sd.c
index 88a212a4ba..3de82ff809 100644
--- a/usr/src/cmd/mdb/common/modules/sd/sd.c
+++ b/usr/src/cmd/mdb/common/modules/sd/sd.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/mdb_modapi.h>
 #include <sys/scsi/scsi.h>
 #include <sys/dkio.h>
@@ -72,7 +70,7 @@ typedef struct i_ddi_soft_state sd_state_str_t, *sd_state_str_ptr;
 /* structure to store soft state statistics */
 typedef struct sd_str {
 	void		*sd_state;
-	uintptr_t 	current_root;
+	uintptr_t	current_root;
 	int		current_list_count;
 	int		valid_root_count;
 	int		silent;
@@ -95,7 +93,7 @@ typedef struct sd_str {
 static int
 buf_avforw_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("buffer address required with the command\n");
 		return (WALK_ERR);
 	}
@@ -127,7 +125,7 @@ buf_avforw_walk_step(mdb_walk_state_t *wsp)
 	 * if walk_addr is null then it effectively means an end of all
 	 * buf structures, hence end the iterations.
 	 */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -308,7 +306,7 @@ init_softstate_members(mdb_walk_state_t *wsp)
 static int
 sd_state_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL &&
+	if (wsp->walk_addr == 0 &&
 	    mdb_readvar(&wsp->walk_addr, "sd_state") == -1) {
 		mdb_warn("failed to read 'sd_state'");
 		return (WALK_ERR);
@@ -458,7 +456,7 @@ process_semo_sleepq(uintptr_t	walk_addr, int silent)
 		rootBuf = (uintptr_t)currentBuf.av_forw;
 	}
 
-	if (rootBuf == NULL) {
+	if (rootBuf == 0) {
 		mdb_printf("------------------------------\n");
 		mdb_printf("Processed %d SEMOCLOSE SLEEP Q entries\n",
 							semo_sleepq_count);
@@ -516,7 +514,7 @@ process_sdlun_waitq(uintptr_t walk_addr, int silent)
 		++sdLunQ_count;
 	}
 
-	if (rootBuf == NULL) {
+	if (rootBuf == 0) {
 		mdb_printf("------------------------------\n");
 		mdb_printf("Processed %d UN WAIT Q entries\n", sdLunQ_count);
 		mdb_printf("------------------------------\n");
@@ -543,7 +541,7 @@ process_xbuf(uintptr_t xbuf_attr, int silent)
 	void			*xba_root;
 	int			xbuf_q_count = 0;
 
-	if (xbuf_attr == NULL) {
+	if (xbuf_attr == 0) {
 		mdb_printf("---------------------------\n");
 		mdb_printf("No XBUF ATTR entry\n");
 		mdb_printf("---------------------------\n");
@@ -630,7 +628,7 @@ print_footer(const void *walk_data)
  *		invokes the walker.
  *		It is called during each walk step. It displays the contents
  *		of the current soft state object (addr) passed to it by the
- * 		step function. It also prints the header and footer during the
+ *		step function. It also prints the header and footer during the
  *		first and the last step of the walker.
  *		The contents of the soft state also includes various queues
  *		it includes like Xbuf, semo_close, sdlun_waitq.
diff --git a/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c b/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c
index a3e86379be..fe69d515fe 100644
--- a/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c
+++ b/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c
@@ -1530,7 +1530,7 @@ static int
 smb_vfs_walk_init(mdb_walk_state_t *wsp)
 {
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_printf("require address of an smb_server_t\n");
 		return (WALK_ERR);
 	}
@@ -1781,7 +1781,7 @@ smb_node_walk_init(mdb_walk_state_t *wsp)
 	int		i;
 	uintptr_t	node_hash_table_addr;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_lookup_by_obj(SMBSRV_OBJNAME, "smb_node_hash_table",
 		    &sym) == -1) {
 			mdb_warn("failed to find 'smb_node_hash_table'");
diff --git a/usr/src/cmd/mdb/common/modules/specfs/specfs.c b/usr/src/cmd/mdb/common/modules/specfs/specfs.c
index 6295cca150..cbc5f9b39f 100644
--- a/usr/src/cmd/mdb/common/modules/specfs/specfs.c
+++ b/usr/src/cmd/mdb/common/modules/specfs/specfs.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_modapi.h>
 #include <sys/types.h>
 #include <sys/sysmacros.h>
@@ -84,7 +82,7 @@ snode_walk_step(mdb_walk_state_t *wsp)
 	struct snode *sp;
 	struct snode snode;
 
-	while (addr == NULL) {
+	while (addr == 0) {
 		if (--sw->sw_stablesz == 0)
 			return (WALK_DONE);
 
diff --git a/usr/src/cmd/mdb/common/modules/sppp/sppp.c b/usr/src/cmd/mdb/common/modules/sppp/sppp.c
index 5314d94b2c..84e67a67c8 100644
--- a/usr/src/cmd/mdb/common/modules/sppp/sppp.c
+++ b/usr/src/cmd/mdb/common/modules/sppp/sppp.c
@@ -64,7 +64,7 @@ sppp_walk_step(mdb_walk_state_t *wsp)
 	spppstr_t sps;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&sps, sizeof (sps), wsp->walk_addr) == -1) {
@@ -110,7 +110,7 @@ sps_format(uintptr_t addr, const spppstr_t *sps, uint_t *qfmt)
 		upaddr = (uintptr_t)sps->sps_rq;
 		upq.q_ptr = NULL;
 		illaddr = 0;
-		while (upaddr != NULL) {
+		while (upaddr != 0) {
 			if (mdb_vread(&upq, sizeof (upq), upaddr) == -1) {
 				upq.q_ptr = NULL;
 				break;
@@ -219,7 +219,7 @@ sppa_walk_step(mdb_walk_state_t *wsp)
 	sppa_t ppa;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&ppa, sizeof (ppa), wsp->walk_addr) == -1) {
@@ -294,7 +294,7 @@ sppp_rnext(const queue_t *q)
 	if (mdb_vread(&sps, sizeof (sps), (uintptr_t)q->q_ptr) == sizeof (sps))
 		return ((uintptr_t)sps.sps_rq);
 
-	return (NULL);
+	return (0);
 }
 
 static uintptr_t
@@ -304,14 +304,14 @@ sppp_wnext(const queue_t *q)
 	sppa_t ppa;
 
 	if (mdb_vread(&sps, sizeof (sps), (uintptr_t)q->q_ptr) != sizeof (sps))
-		return (NULL);
+		return (0);
 
 	if (sps.sps_ppa != NULL &&
 	    mdb_vread(&ppa, sizeof (ppa), (uintptr_t)sps.sps_ppa) ==
 	    sizeof (ppa))
 		return ((uintptr_t)ppa.ppa_lower_wq);
 
-	return (NULL);
+	return (0);
 }
 
 /* ****************** sppptun ****************** */
@@ -387,7 +387,7 @@ tuncl_walk_step(mdb_walk_state_t *wsp)
 	struct tcl_walk_data *twd;
 	uintptr_t addr;
 
-	if (wsp == NULL || wsp->walk_addr == NULL)
+	if (wsp == NULL || wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	twd = (struct tcl_walk_data *)wsp->walk_addr;
@@ -627,7 +627,7 @@ sppptun_rnext(const queue_t *q)
 	union tun_state ts;
 
 	if (tun_state_read(q->q_ptr, &ts) == -1)
-		return (NULL);
+		return (0);
 
 	if (ts.tcl.tcl_flags & TCLF_ISCLIENT) {
 		return ((uintptr_t)ts.tcl.tcl_rq);
@@ -643,14 +643,14 @@ sppptun_wnext(const queue_t *q)
 	union tun_state ts;
 
 	if (tun_state_read(q->q_ptr, &ts) == -1)
-		return (NULL);
+		return (0);
 
 	if (ts.tcl.tcl_flags & TCLF_ISCLIENT) {
 		if (ts.tcl.tcl_data_tll == NULL)
-			return (NULL);
+			return (0);
 		if (mdb_vread(&ts.tll, sizeof (ts.tll),
 		    (uintptr_t)ts.tcl.tcl_data_tll) != sizeof (ts.tll)) {
-			return (NULL);
+			return (0);
 		}
 	}
 	return ((uintptr_t)ts.tll.tll_wq);
diff --git a/usr/src/cmd/mdb/common/modules/srpt/srpt.c b/usr/src/cmd/mdb/common/modules/srpt/srpt.c
index 6da3af074c..c0d904f830 100644
--- a/usr/src/cmd/mdb/common/modules/srpt/srpt.c
+++ b/usr/src/cmd/mdb/common/modules/srpt/srpt.c
@@ -76,7 +76,7 @@ srpt_ioc_walk_init(mdb_walk_state_t *wsp)
 static int
 srpt_list_walk_step(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 	return (wsp->walk_callback(wsp->walk_addr, wsp->walk_layer,
@@ -96,7 +96,7 @@ srpt_tgt_walk_init(mdb_walk_state_t *wsp)
 	 * Input should be a srpt_ioc_t, read it to get the
 	 * srpt_target_port_t
 	 */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<srpt_ioc_t addr>::walk srpt_target\n");
 		return (WALK_ERR);
 	}
@@ -114,7 +114,7 @@ srpt_tgt_walk_init(mdb_walk_state_t *wsp)
 static int
 srpt_tgt_walk_step(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -143,7 +143,7 @@ srpt_channel_walk_init(mdb_walk_state_t *wsp)
 	 * Input should be a srpt_target_port_t, read it to get the
 	 * list of channels
 	 */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<srpt_target_port_t addr>::walk srpt_channel\n");
 		return (WALK_ERR);
 	}
@@ -168,7 +168,7 @@ srpt_scsi_session_walk_init(mdb_walk_state_t *wsp)
 	 * Input should be a srpt_target_port_t, read it to get the
 	 * srpt_session_t
 	 */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<srpt_target_port_t addr>::walk srpt_scsi_session\n");
 		return (WALK_ERR);
 	}
@@ -189,7 +189,7 @@ srpt_scsi_session_walk_init(mdb_walk_state_t *wsp)
 static int
 srpt_task_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<srpt_session_t addr>::walk srpt_tasks\n");
 		return (WALK_ERR);
 	}
@@ -211,7 +211,7 @@ srpt_print_ioc(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	char		mask[9];
 	int		i;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("address of srpt_ioc should be specified\n");
 		return (DCMD_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/stmf/stmf.c b/usr/src/cmd/mdb/common/modules/stmf/stmf.c
index 66a5fc5522..a724262c6e 100644
--- a/usr/src/cmd/mdb/common/modules/stmf/stmf.c
+++ b/usr/src/cmd/mdb/common/modules/stmf/stmf.c
@@ -42,7 +42,7 @@
 static int
 stmf_ilport_walk_i(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		struct stmf_state state;
 
 		if (mdb_readsym(&state, sizeof (struct stmf_state),
@@ -62,7 +62,7 @@ stmf_ilport_walk_s(mdb_walk_state_t *wsp)
 {
 	int status = WALK_NEXT;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (struct stmf_i_local_port),
@@ -167,12 +167,12 @@ stmf_ilports(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 struct stmf_i_local_port *
 next_stmf_port(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (stmf_ilport_walk_i(wsp) == WALK_ERR) {
 			stmf_ilport_walk_f(wsp);
 			return (NULL);
 		}
-		if (wsp->walk_addr == NULL)
+		if (wsp->walk_addr == 0)
 			stmf_ilport_walk_f(wsp);
 		return ((struct stmf_i_local_port *)wsp->walk_addr);
 	}
@@ -181,7 +181,7 @@ next_stmf_port(mdb_walk_state_t *wsp)
 		stmf_ilport_walk_f(wsp);
 		return (NULL);
 	}
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		stmf_ilport_walk_f(wsp);
 	return ((struct stmf_i_local_port *)wsp->walk_addr);
 }
@@ -209,7 +209,7 @@ stmf_iss(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		}
 	}
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("address of stmf_i_local_port should be specified\n");
 		return (DCMD_ERR);
 	}
@@ -561,7 +561,7 @@ fct_irp_walk_i(mdb_walk_state_t *wsp)
 	struct fct_local_port port;
 	struct fct_i_local_port iport;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("Can not perform global walk");
 		return (WALK_ERR);
 	}
@@ -595,7 +595,7 @@ fct_irp_walk_s(mdb_walk_state_t *wsp)
 	int status = WALK_NEXT;
 	fct_i_remote_port_t *rp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (rp_index++ >= port_max_logins)
@@ -621,7 +621,7 @@ fct_irp_walk_s(mdb_walk_state_t *wsp)
 static void
 fct_irp_walk_f(mdb_walk_state_t *wsp)
 {
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = 0;
 }
 
 /*
@@ -688,7 +688,7 @@ fct_irps(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	return (DCMD_OK);
 }
 
-static uintptr_t cur_iport_for_irp_loop = NULL;
+static uintptr_t cur_iport_for_irp_loop = 0;
 
 static fct_i_remote_port_t *
 next_rport(struct fct_i_local_port *iport)
@@ -698,7 +698,7 @@ next_rport(struct fct_i_local_port *iport)
 	int ret;
 	fct_i_remote_port_t *irp;
 
-	if (ws.walk_addr == NULL || cur_iport_for_irp_loop !=
+	if (ws.walk_addr == 0 || cur_iport_for_irp_loop !=
 	    (uintptr_t)iport) {
 		*((fct_i_remote_port_t **)ws.walk_cbdata) = NULL;
 		cur_iport_for_irp_loop = (uintptr_t)iport;
@@ -707,7 +707,7 @@ next_rport(struct fct_i_local_port *iport)
 			fct_irp_walk_f(&ws);
 			return (NULL);
 		}
-		if (ws.walk_addr == NULL) {
+		if (ws.walk_addr == 0) {
 			fct_irp_walk_f(&ws);
 			return (NULL);
 		}
@@ -805,7 +805,7 @@ find_irp_by_wwn(struct stmf_i_local_port *siport, uint8_t wwn[8])
 			break;
 		}
 	}
-	cur_iport_for_irp_loop = NULL;
+	cur_iport_for_irp_loop = 0;
 	return (ret);
 }
 
@@ -1142,7 +1142,7 @@ stmf_scsi_task_walk_init(mdb_walk_state_t *wsp)
 	 * Input should be a stmf_worker, so read it to get the
 	 * worker_task_head to get the start of the task list
 	 */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<worker addr>::walk stmf_scsi_task\n");
 		return (WALK_ERR);
 	}
@@ -1165,7 +1165,7 @@ stmf_scsi_task_walk_step(mdb_walk_state_t *wsp)
 	stmf_i_scsi_task_t	itask;
 	int			status;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
@@ -1329,7 +1329,7 @@ stmf_worker_walk_step(mdb_walk_state_t *wsp)
 	stmf_worker_walk_data_t	*walk_data = wsp->walk_data;
 	int			status;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		return (WALK_DONE);
 	}
 
diff --git a/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c b/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c
index a10f511d06..d48604dd90 100644
--- a/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c
+++ b/usr/src/cmd/mdb/common/modules/stmf_sbd/stmf_sbd.c
@@ -257,7 +257,7 @@ stmf_sbd_pgr_key_dcmd_help(void)
 static int
 stmf_sbd_lu_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&wsp->walk_addr, "sbd_lu_list") == -1) {
 			mdb_warn("failed to read sbd_lu_list\n");
 			return (WALK_ERR);
@@ -272,7 +272,7 @@ stmf_sbd_lu_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t	addr = wsp->walk_addr;
 	sbd_lu_t	slu;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&slu, sizeof (sbd_lu_t), addr) == -1) {
@@ -326,7 +326,7 @@ stmf_sbd_lu_cb(uintptr_t addr, const sbd_lu_t *slu, stmf_sbd_cb_t *cb_st)
 static int
 stmf_sbd_pgr_key_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<pgr_key_list addr>::walk stmf_sbd_pgr_key\n");
 		return (WALK_ERR);
 	}
@@ -339,7 +339,7 @@ stmf_sbd_pgr_key_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t	addr = wsp->walk_addr;
 	sbd_pgr_key_t	key;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&key, sizeof (sbd_pgr_key_t), addr) == -1) {
@@ -383,7 +383,7 @@ stmf_sbd_pgr_key_cb(uintptr_t addr, const sbd_pgr_key_t *key,
 static int
 stmf_sbd_it_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("<sbd_it_list addr>::walk stmf_sbd_pgr_key\n");
 		return (WALK_ERR);
 	}
@@ -396,7 +396,7 @@ stmf_sbd_it_walk_step(mdb_walk_state_t *wsp)
 	uintptr_t	addr = wsp->walk_addr;
 	sbd_it_data_t	it;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&it, sizeof (sbd_it_data_t), addr) == -1) {
diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs.c b/usr/src/cmd/mdb/common/modules/ufs/ufs.c
index d288718b7e..422048adc2 100644
--- a/usr/src/cmd/mdb/common/modules/ufs/ufs.c
+++ b/usr/src/cmd/mdb/common/modules/ufs/ufs.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_modapi.h>
 #include <mdb/mdb_ks.h>
 #include <sys/types.h>
@@ -50,7 +48,7 @@ inode_walk_init(mdb_walk_state_t *wsp)
 	union ihead ih;
 	inode_walk_data_t *iw;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("inode_cache only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -342,7 +340,7 @@ acl_walk_init(mdb_walk_state_t *wsp)
 	si_t *si;
 	ufs_ic_acl_t **aclpp;
 
-	if (addr == NULL) {
+	if (addr == 0) {
 		mdb_warn("acl walk needs an inode address\n");
 		return (WALK_ERR);
 	}
@@ -382,7 +380,7 @@ acl_walk_step(mdb_walk_state_t *wsp)
 	ufs_ic_acl_t **aclpp;
 	ufs_ic_acl_t acl;
 
-	while (addr == NULL) {
+	while (addr == 0) {
 		wsp->walk_arg = (void *)(uintptr_t)++i;
 
 		if (acl_map[i].am_offset == -1)
diff --git a/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c b/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c
index 742db1d0c0..fc3d97a736 100644
--- a/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c
+++ b/usr/src/cmd/mdb/common/modules/ufs/ufs_log.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <mdb/mdb_modapi.h>
 
 #include <sys/types.h>
@@ -50,7 +48,7 @@ ufslogmap_walk_init(mdb_walk_state_t *wsp)
 {
 	ufslogmap_walk_data_t *uw;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must specify an address\n");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/uhci/uhci.c b/usr/src/cmd/mdb/common/modules/uhci/uhci.c
index 0129cf5147..29e0b5b8c2 100644
--- a/usr/src/cmd/mdb/common/modules/uhci/uhci.c
+++ b/usr/src/cmd/mdb/common/modules/uhci/uhci.c
@@ -231,7 +231,7 @@ uhci_td(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	mdb_printf("\n  UHCI td struct at (vaddr) %08x:\n", addr);
 
-	if (!(td.link_ptr & HC_END_OF_LIST) && td.link_ptr != NULL) {
+	if (!(td.link_ptr & HC_END_OF_LIST) && td.link_ptr != 0) {
 		mdb_printf("        link_ptr (paddr)    : %-8x        "
 		    "(vaddr)      : %p\n",
 		    td.link_ptr,
@@ -258,7 +258,7 @@ uhci_td(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	    "startingframe: %0x\n", td.isoc_pkt_index, td.starting_frame);
 
 
-	if (td.link_ptr == NULL)  {
+	if (td.link_ptr == 0)  {
 		mdb_printf("        --> Link pointer = NULL\n");
 		return (DCMD_ERR);
 	} else {
@@ -343,7 +343,7 @@ uhci_qh(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	mdb_printf("\n  UHCI qh struct at (vaddr) %08x:\n", addr);
 
-	if (!(qh.link_ptr & HC_END_OF_LIST) && qh.link_ptr != NULL) {
+	if (!(qh.link_ptr & HC_END_OF_LIST) && qh.link_ptr != 0) {
 		mdb_printf("        link_ptr (paddr)    : %08x        "
 		    "(vaddr)      : %p\n",
 		    qh.link_ptr,
@@ -355,7 +355,7 @@ uhci_qh(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		    qh.link_ptr);
 	}
 
-	if (!(qh.element_ptr & HC_END_OF_LIST) && qh.element_ptr != NULL) {
+	if (!(qh.element_ptr & HC_END_OF_LIST) && qh.element_ptr != 0) {
 		mdb_printf("        element_ptr (paddr) : %08x        "
 		    "(vaddr)      : %p\n",
 		    qh.element_ptr,
@@ -375,7 +375,7 @@ uhci_qh(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	mdb_printf("        bulk_xfer_isoc_info : %?p\n", qh.bulk_xfer_info);
 
 
-	if (qh.link_ptr == NULL)  {
+	if (qh.link_ptr == 0)  {
 		mdb_printf("        --> Link pointer = NULL\n");
 		return (DCMD_ERR);
 	} else {
@@ -398,7 +398,7 @@ uhci_qh(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	}
 
 
-	if (qh.element_ptr == NULL)  {
+	if (qh.element_ptr == 0)  {
 		mdb_printf("        element_ptr = NULL\n");
 		return (DCMD_ERR);
 	} else {
@@ -449,7 +449,7 @@ uhci_qh(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 uhci_td_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)  {
+	if (wsp->walk_addr == 0)  {
 		return (DCMD_USAGE);
 	}
 
@@ -495,7 +495,7 @@ uhci_td_walk_step(mdb_walk_state_t *wsp)
 	wsp->walk_addr = ((uhci_td_t *)wsp->walk_data)->link_ptr;
 
 	/* Check if we're at the last element */
-	if (wsp->walk_addr == NULL || wsp->walk_addr & HC_END_OF_LIST)
+	if (wsp->walk_addr == 0 || wsp->walk_addr & HC_END_OF_LIST)
 		return (WALK_DONE);
 
 	/* Make sure next element is a TD.  If a QH, stop.  */
@@ -507,7 +507,7 @@ uhci_td_walk_step(mdb_walk_state_t *wsp)
 	/* Strip terminate etc. bits.  */
 	wsp->walk_addr &= QH_LINK_PTR_MASK; /* there is no TD_LINK_PTR_MASK */
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	/*
@@ -528,7 +528,7 @@ uhci_td_walk_step(mdb_walk_state_t *wsp)
 int
 uhci_qh_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (DCMD_USAGE);
 
 	wsp->walk_data = mdb_alloc(sizeof (queue_head_t), UM_SLEEP | UM_GC);
@@ -560,7 +560,7 @@ uhci_qh_walk_step(mdb_walk_state_t *wsp)
 	uhci_state_t	*uhcip = (uhci_state_t *)wsp->walk_arg;
 
 
-	if (wsp->walk_addr == NULL)	/* Should never occur */
+	if (wsp->walk_addr == 0)	/* Should never occur */
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (queue_head_t), wsp->walk_addr)
@@ -577,7 +577,7 @@ uhci_qh_walk_step(mdb_walk_state_t *wsp)
 
 
 	/* Check if we're at the last element */
-	if (wsp->walk_addr == NULL || wsp->walk_addr & HC_END_OF_LIST)  {
+	if (wsp->walk_addr == 0 || wsp->walk_addr & HC_END_OF_LIST)  {
 		return (WALK_DONE);
 	}
 
@@ -590,7 +590,7 @@ uhci_qh_walk_step(mdb_walk_state_t *wsp)
 	/* Strip terminate etc. bits.  */
 	wsp->walk_addr &= QH_LINK_PTR_MASK;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	/*
diff --git a/usr/src/cmd/mdb/common/modules/usba/usb.c b/usr/src/cmd/mdb/common/modules/usba/usb.c
index 6791ada63b..df3f89b58c 100644
--- a/usr/src/cmd/mdb/common/modules/usba/usb.c
+++ b/usr/src/cmd/mdb/common/modules/usba/usb.c
@@ -100,7 +100,7 @@ find_dip(uintptr_t dip_addr, const void *local_dip, void *cb_arg)
 	usba_device2devinfo_cbdata_t	*cb_data =
 	    (usba_device2devinfo_cbdata_t *)cb_arg;
 
-	if ((cur_usb_dev = mdb_usba_get_usba_device(dip_addr)) == NULL) {
+	if ((cur_usb_dev = mdb_usba_get_usba_device(dip_addr)) == 0) {
 		/*
 		 * If there's no corresponding usba_device_t, this dip isn't
 		 * a usb node.  Might be an sd node.  Ignore it.
@@ -184,7 +184,7 @@ int
 usba_list_walk_init(mdb_walk_state_t *wsp)
 {
 	/* Must have a start addr.  */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("not a global walk.  Starting address required\n");
 
 		return (WALK_ERR);
@@ -217,7 +217,7 @@ usba_list_walk_step(mdb_walk_state_t *wsp)
 	wsp->walk_addr = (uintptr_t)list_entry.next;
 
 	/* Check if we're at the last element */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 
 		return (WALK_DONE);
 	}
@@ -239,7 +239,7 @@ usba_list_walk_step(mdb_walk_state_t *wsp)
 int
 usb_pipe_handle_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("not a global walk; usba_device_t required\n");
 
 		return (WALK_ERR);
@@ -405,7 +405,7 @@ usba_device_walk_init(mdb_walk_state_t *wsp)
 {
 	usba_list_entry_t	list_entry;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn(
 		    "global walk only.  Must be invoked without an address\n");
 
@@ -505,7 +505,7 @@ usba_device(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	char		pathname[MAXNAMELEN];
 	char		dname[MODMAXNAMELEN + 1] = "<unatt>"; /* Driver name */
 	char		drv_statep[MODMAXNAMELEN+ 10];
-	uint_t		usb_flag  = NULL;
+	uint_t		usb_flag  = 0;
 	boolean_t	no_driver_attached = FALSE;
 	uintptr_t	dip_addr;
 	struct dev_info	devinfo;
@@ -577,7 +577,7 @@ usba_device(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	if (usb_flag & USB_DUMP_VERBOSE) {
 		int		i;
-		uintptr_t	statep = NULL;
+		uintptr_t	statep = 0;
 		char		*string_descr;
 		char		**config_cloud, **conf_str_descr;
 		usb_dev_descr_t	usb_dev_descr;
@@ -786,7 +786,7 @@ usba_debug_buf(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	}
 	local_debug_buf[debug_buf_size - 1] = '\0';
 
-	if (strlen(local_debug_buf) == NULL) {
+	if (strlen(local_debug_buf) == 0) {
 
 		return (DCMD_OK);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/usba/usba.c b/usr/src/cmd/mdb/common/modules/usba/usba.c
index c60f27316e..7a220d3287 100644
--- a/usr/src/cmd/mdb/common/modules/usba/usba.c
+++ b/usr/src/cmd/mdb/common/modules/usba/usba.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Routines extracted from usr/src/uts/common/io/usb/usba/usba.c.
  */
@@ -48,7 +46,7 @@ mdb_usba_is_root_hub(struct dev_info *dip)
 {
 	uintptr_t	p = (uintptr_t)dip->devi_hw_prop_ptr;
 
-	while (p != NULL) {
+	while (p != 0) {
 		ddi_prop_t prop;
 		char prop_name[128];
 
@@ -98,7 +96,7 @@ mdb_usba_get_usba_device(uintptr_t dip_addr)
 	if (mdb_vread(&devinfo, sizeof (struct dev_info), dip_addr) == -1) {
 		mdb_warn("failed to read dev_info at %p", dip_addr);
 
-		return (NULL);
+		return (0);
 	}
 
 	/*
@@ -114,7 +112,7 @@ mdb_usba_get_usba_device(uintptr_t dip_addr)
 
 		if (!hcdi_addr) {
 
-			return (NULL);
+			return (0);
 		}
 
 		/* Read hcdi struct into local address space. */
@@ -122,7 +120,7 @@ mdb_usba_get_usba_device(uintptr_t dip_addr)
 		    hcdi_addr) == -1) {
 			mdb_warn("failed to read hcdi struct");
 
-			return (NULL);
+			return (0);
 		}
 
 		return ((uintptr_t)hcdi_struct.hcdi_usba_device);
@@ -134,7 +132,7 @@ mdb_usba_get_usba_device(uintptr_t dip_addr)
 		    dip_addr) == -1) {
 			mdb_warn("failed to read dev_info at %p", dip_addr);
 
-			return (NULL);
+			return (0);
 		}
 
 		/* casts needed to keep lint happy */
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
index dcb61ec63b..a31665cdf1 100644
--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
@@ -1558,7 +1558,7 @@ metaslab_stats(uintptr_t addr, int spa_flags)
 		    (uintptr_t)vdev_ms[m], 0) == -1)
 			return (DCMD_ERR);
 
-		if (ms.ms_sm != NULL &&
+		if (ms.ms_sm != 0 &&
 		    mdb_ctf_vread(&sm, "space_map_t", "mdb_space_map_t",
 		    ms.ms_sm, 0) == -1)
 			return (DCMD_ERR);
@@ -1572,10 +1572,10 @@ metaslab_stats(uintptr_t addr, int spa_flags)
 		else
 			mdb_printf("%9llu%%\n", ms.ms_fragmentation);
 
-		if ((spa_flags & SPA_FLAG_HISTOGRAMS) && ms.ms_sm != NULL) {
+		if ((spa_flags & SPA_FLAG_HISTOGRAMS) && ms.ms_sm != 0) {
 			mdb_space_map_phys_t smp;
 
-			if (sm.sm_phys == NULL)
+			if (sm.sm_phys == 0)
 				continue;
 
 			(void) mdb_ctf_vread(&smp, "space_map_phys_t",
@@ -1926,7 +1926,7 @@ metaslab_trace(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		    "VDEV");
 	}
 
-	if (mat.mat_msp != NULL) {
+	if (mat.mat_msp != 0) {
 		mdb_metaslab_t ms;
 
 		if (mdb_ctf_vread(&ms, "metaslab_t", "mdb_metaslab_t",
@@ -1954,13 +1954,13 @@ metaslab_trace(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		mdb_printf("%<b>%18llx%</b> ", mat.mat_offset);
 	}
 
-	if (mat.mat_mg != NULL &&
+	if (mat.mat_mg != 0 &&
 	    mdb_ctf_vread(&mg, "metaslab_group_t", "mdb_metaslab_group_t",
 	    mat.mat_mg, 0) == -1) {
 		return (DCMD_ERR);
 	}
 
-	if (mg.mg_vd != NULL) {
+	if (mg.mg_vd != 0) {
 		mdb_vdev_t vdev;
 		char desc[MAXNAMELEN];
 
@@ -1969,7 +1969,7 @@ metaslab_trace(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			return (DCMD_ERR);
 		}
 
-		if (vdev.vdev_path != NULL) {
+		if (vdev.vdev_path != 0) {
 			char path[MAXNAMELEN];
 
 			if (mdb_readstr(path, sizeof (path),
@@ -1984,7 +1984,7 @@ metaslab_trace(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			} else {
 				strcpy(desc, path);
 			}
-		} else if (vdev.vdev_ops != NULL) {
+		} else if (vdev.vdev_ops != 0) {
 			mdb_vdev_ops_t ops;
 			if (mdb_ctf_vread(&ops, "vdev_ops_t", "mdb_vdev_ops_t",
 			    vdev.vdev_ops, 0) == -1) {
@@ -2070,7 +2070,7 @@ metaslab_walk_init(mdb_walk_state_t *wsp)
 	uintptr_t root_vdevp;
 	uintptr_t childp;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must supply address of spa_t\n");
 		return (WALK_ERR);
 	}
@@ -2171,12 +2171,12 @@ space_cb(uintptr_t addr, const void *unknown, void *arg)
 		return (WALK_ERR);
 	sd->ms_allocatable += rt.rt_space;
 
-	if (ms.ms_sm != NULL &&
+	if (ms.ms_sm != 0 &&
 	    mdb_ctf_vread(&sm, "space_map_t",
 	    "mdb_space_map_t", ms.ms_sm, 0) == -1)
 		return (WALK_ERR);
 
-	if (sm.sm_phys != NULL) {
+	if (sm.sm_phys != 0) {
 		(void) mdb_ctf_vread(&smp, "space_map_phys_t",
 		    "mdb_space_map_phys_t", sm.sm_phys, 0);
 	}
@@ -2370,7 +2370,7 @@ spa_vdevs(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	/*
 	 * Unitialized spa_t structures can have a NULL root vdev.
 	 */
-	if (spa.spa_root_vdev == NULL) {
+	if (spa.spa_root_vdev == 0) {
 		mdb_printf("no associated vdevs\n");
 		return (DCMD_OK);
 	}
@@ -2650,7 +2650,7 @@ multilist_walk_init(mdb_walk_state_t *wsp)
 {
 	multilist_walk_data_t *mwd;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must supply address of multilist_t\n");
 		return (WALK_ERR);
 	}
@@ -2662,7 +2662,7 @@ multilist_walk_init(mdb_walk_state_t *wsp)
 	}
 
 	if (mwd->mwd_ml.ml_num_sublists == 0 ||
-	    mwd->mwd_ml.ml_sublists == NULL) {
+	    mwd->mwd_ml.ml_sublists == 0) {
 		mdb_warn("invalid or uninitialized multilist at %#lx\n",
 		    wsp->walk_addr);
 		return (WALK_ERR);
@@ -2751,12 +2751,12 @@ txg_list_walk_step(mdb_walk_state_t *wsp)
 	txg_node_t *node;
 	int status;
 
-	while (wsp->walk_addr == NULL && lwd->lw_txgoff < lwd->lw_maxoff) {
+	while (wsp->walk_addr == 0 && lwd->lw_txgoff < lwd->lw_maxoff) {
 		lwd->lw_txgoff++;
 		wsp->walk_addr = lwd->lw_head[lwd->lw_txgoff];
 	}
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	addr = wsp->walk_addr - lwd->lw_offset;
@@ -2785,7 +2785,7 @@ spa_walk_init(mdb_walk_state_t *wsp)
 {
 	GElf_Sym sym;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("spa walk only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -3232,7 +3232,7 @@ sa_attr_print(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	}
 
 	if (bonus_tab && !TOC_ATTR_PRESENT(offset_tab[attr_id]) &&
-	    spill_tab == NULL) {
+	    spill_tab == 0) {
 		mdb_printf("Attribute does not exist\n");
 		return (DCMD_ERR);
 	} else if (!TOC_ATTR_PRESENT(offset_tab[attr_id]) && spill_tab) {
@@ -3546,7 +3546,7 @@ zfs_acl_dump(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 static int
 zfs_acl_node_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must supply address of zfs_acl_node_t\n");
 		return (WALK_ERR);
 	}
@@ -3587,7 +3587,7 @@ zfs_aces_walk_init_common(mdb_walk_state_t *wsp, int version,
 {
 	ace_walk_data_t *ace_walk_data;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("must supply address of zfs_acl_node_t\n");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/i86pc/modules/unix/i86mmu.c b/usr/src/cmd/mdb/i86pc/modules/unix/i86mmu.c
index 15f4697b91..7aaa5d0924 100644
--- a/usr/src/cmd/mdb/i86pc/modules/unix/i86mmu.c
+++ b/usr/src/cmd/mdb/i86pc/modules/unix/i86mmu.c
@@ -112,7 +112,7 @@ memseg_list(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 int
 memseg_walk_init(mdb_walk_state_t *wsp)
 {
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("memseg only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -200,10 +200,10 @@ init_mmu(void)
 	    mdb_readsym(&xen_virt_start, sizeof (xen_virt_start),
 	    "xen_virt_start") == -1 ||
 	    mdb_readsym(&mfn_count, sizeof (mfn_count), "mfn_count") == -1) {
-		mfn_list_addr = NULL;
+		mfn_list_addr = 0;
 	}
 
-	is_xpv = mfn_list_addr != NULL;
+	is_xpv = mfn_list_addr != 0;
 
 #ifndef _KMDB
 	/*
@@ -247,7 +247,7 @@ mdb_mfn_to_pfn(mfn_t mfn)
 	mfn_t tmp;
 	pfn_t *pfn_list;
 
-	if (mfn_list_addr == NULL)
+	if (mfn_list_addr == 0)
 		return (-(pfn_t)1);
 
 	pfn_list = (pfn_t *)xen_virt_start;
@@ -271,7 +271,7 @@ mdb_pfn_to_mfn(pfn_t pfn)
 
 	init_mmu();
 
-	if (mfn_list_addr == NULL || pfn >= mfn_count)
+	if (mfn_list_addr == 0 || pfn >= mfn_count)
 		return (-(mfn_t)1);
 
 	if (mdb_vread(&mfn, sizeof (mfn),
diff --git a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c
index 92ac3f83ca..bb9c985374 100644
--- a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c
+++ b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c
@@ -90,7 +90,7 @@ ttrace_walk_init(mdb_walk_state_t *wsp)
 
 	ttcp = mdb_zalloc(ttc_size, UM_SLEEP);
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("ttrace only supports global walks\n");
 		return (WALK_ERR);
 	}
@@ -113,7 +113,7 @@ ttrace_walk_init(mdb_walk_state_t *wsp)
 	for (i = 0; i < NCPU; i++) {
 		trap_trace_ctl_t *ttc = &ttcp[i];
 
-		if (ttc->ttc_first == NULL)
+		if (ttc->ttc_first == 0)
 			continue;
 
 		/*
@@ -144,7 +144,7 @@ ttrace_walk_step(mdb_walk_state_t *wsp)
 	for (i = 0; i < NCPU; i++) {
 		ttc = &ttcp[i];
 
-		if (ttc->ttc_current == NULL)
+		if (ttc->ttc_current == 0)
 			continue;
 
 		if (ttc->ttc_current < ttc->ttc_first)
@@ -174,7 +174,7 @@ ttrace_walk_step(mdb_walk_state_t *wsp)
 	rval = wsp->walk_callback(ttc->ttc_current, &rec, wsp->walk_cbdata);
 
 	if (ttc->ttc_current == ttc->ttc_next)
-		ttc->ttc_current = NULL;
+		ttc->ttc_current = 0;
 	else
 		ttc->ttc_current -= sizeof (trap_trace_rec_t);
 
@@ -614,7 +614,7 @@ mutex_owner_step(mdb_walk_state_t *wsp)
 	if (!MUTEX_TYPE_ADAPTIVE(&mtx))
 		return (WALK_DONE);
 
-	if ((owner = (uintptr_t)MUTEX_OWNER(&mtx)) == NULL)
+	if ((owner = (uintptr_t)MUTEX_OWNER(&mtx)) == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(&thr, sizeof (thr), owner) != -1)
diff --git a/usr/src/cmd/mdb/i86xpv/modules/xpv/xpv.c b/usr/src/cmd/mdb/i86xpv/modules/xpv/xpv.c
index eb294d45d7..05670a4f72 100644
--- a/usr/src/cmd/mdb/i86xpv/modules/xpv/xpv.c
+++ b/usr/src/cmd/mdb/i86xpv/modules/xpv/xpv.c
@@ -97,8 +97,8 @@ domain_walk_init(mdb_walk_state_t *wsp)
 {
 	domain_walk_t *dwp;
 
-	if (wsp->walk_addr == NULL)
-		if ((wsp->walk_addr = get_dom0_addr()) == NULL)
+	if (wsp->walk_addr == 0)
+		if ((wsp->walk_addr = get_dom0_addr()) == 0)
 			return (WALK_ERR);
 
 	dwp = mdb_alloc(sizeof (domain_walk_t), UM_SLEEP);
@@ -114,7 +114,7 @@ domain_walk_step(mdb_walk_state_t *wsp)
 	mdb_xpv_domain_t dom;
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	status = wsp->walk_callback(wsp->walk_addr, (void *)wsp->walk_addr,
@@ -148,8 +148,8 @@ vcpu_walk_init(mdb_walk_state_t *wsp)
 	vcpu_walk_t *vwp;
 	uintptr_t off;
 
-	if (wsp->walk_addr == NULL)
-		if ((wsp->walk_addr = get_dom0_addr()) == NULL)
+	if (wsp->walk_addr == 0)
+		if ((wsp->walk_addr = get_dom0_addr()) == 0)
 			return (WALK_ERR);
 
 	if (mdb_ctf_offsetof(domain_type, "vcpu", &off)) {
@@ -174,7 +174,7 @@ vcpu_walk_step(mdb_walk_state_t *wsp)
 
 	if (vwp->vw_count++ >= MAX_VIRT_CPUS)
 		return (WALK_DONE);
-	if ((wsp->walk_addr == NULL) ||
+	if ((wsp->walk_addr == 0) ||
 	    (mdb_vread(&vcpu_ptr, sizeof (uintptr_t), wsp->walk_addr) == -1) ||
 	    (vcpu_ptr == 0))
 		return (WALK_DONE);
diff --git a/usr/src/cmd/mdb/i86xpv/modules/xpv_psm/xpv_psm.c b/usr/src/cmd/mdb/i86xpv/modules/xpv_psm/xpv_psm.c
index 3717a17d66..219c2d9152 100644
--- a/usr/src/cmd/mdb/i86xpv/modules/xpv_psm/xpv_psm.c
+++ b/usr/src/cmd/mdb/i86xpv/modules/xpv_psm/xpv_psm.c
@@ -281,7 +281,7 @@ print_bus(int irq)
 
 	dip_addr = (uintptr_t)avhp.av_dip;
 
-	if (dip_addr == NULL)
+	if (dip_addr == 0)
 		goto fail;
 
 	/*
diff --git a/usr/src/cmd/mdb/intel/kmdb/kaif.c b/usr/src/cmd/mdb/intel/kmdb/kaif.c
index 55754f4130..39cc9b620a 100644
--- a/usr/src/cmd/mdb/intel/kmdb/kaif.c
+++ b/usr/src/cmd/mdb/intel/kmdb/kaif.c
@@ -268,7 +268,7 @@ kaif_toxic_text(uintptr_t addr)
 	static GElf_Sym toxic_syms[2] = { 0, };
 	size_t i;
 
-	if (toxic_syms[0].st_name == NULL) {
+	if (toxic_syms[0].st_name == 0) {
 		if (mdb_tgt_lookup_by_name(mdb.m_target, MDB_TGT_OBJ_EXEC,
 		    "tr_iret_user", &toxic_syms[0], NULL) != 0)
 			warn("couldn't find tr_iret_user\n");
@@ -693,7 +693,7 @@ kaif_dump_crumbs(uintptr_t addr, int cpuid)
 {
 	int i;
 
-	if (addr != NULL) {
+	if (addr != 0) {
 		/* dump_crumb will protect us against bogus addresses */
 		dump_crumb((kdi_crumb_t *)addr);
 
diff --git a/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c b/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c
index b878fef855..4bfb32fa20 100644
--- a/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c
+++ b/usr/src/cmd/mdb/intel/mdb/kvm_amd64dep.c
@@ -271,7 +271,7 @@ kt_amd64_init(mdb_tgt_t *t)
 	};
 
 	if (mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &addr, sizeof (addr),
-	    MDB_TGT_OBJ_EXEC, "panic_reg") == sizeof (addr) && addr != NULL &&
+	    MDB_TGT_OBJ_EXEC, "panic_reg") == sizeof (addr) && addr != 0 &&
 	    mdb_tgt_vread(t, &regs, sizeof (regs), addr) == sizeof (regs)) {
 		kt_regs_to_kregs(&regs, kt->k_regs);
 		return;
diff --git a/usr/src/cmd/mdb/intel/mdb/kvm_ia32dep.c b/usr/src/cmd/mdb/intel/mdb/kvm_ia32dep.c
index 64cbaff939..a5e336acdf 100644
--- a/usr/src/cmd/mdb/intel/mdb/kvm_ia32dep.c
+++ b/usr/src/cmd/mdb/intel/mdb/kvm_ia32dep.c
@@ -267,7 +267,7 @@ kt_ia32_init(mdb_tgt_t *t)
 	}
 
 	if (mdb_tgt_readsym(t, MDB_TGT_AS_VIRT, &addr, sizeof (addr),
-	    MDB_TGT_OBJ_EXEC, "panic_reg") == sizeof (addr) && addr != NULL &&
+	    MDB_TGT_OBJ_EXEC, "panic_reg") == sizeof (addr) && addr != 0 &&
 	    mdb_tgt_vread(t, &regs, sizeof (regs), addr) == sizeof (regs)) {
 		kt_regs_to_kregs(&regs, kt->k_regs);
 		return;
diff --git a/usr/src/cmd/mdb/intel/modules/generic_cpu/gcpu.c b/usr/src/cmd/mdb/intel/modules/generic_cpu/gcpu.c
index b43bfa236d..b5bd85fff8 100644
--- a/usr/src/cmd/mdb/intel/modules/generic_cpu/gcpu.c
+++ b/usr/src/cmd/mdb/intel/modules/generic_cpu/gcpu.c
@@ -160,7 +160,7 @@ cmih_walk_init(mdb_walk_state_t *wsp)
 	void *pg;
 	cmi_hdl_ent_t *ent;
 
-	if (wsp->walk_addr != NULL) {
+	if (wsp->walk_addr != 0) {
 		mdb_warn("cmihdl is a global walker\n");
 		return (WALK_ERR);
 	}
@@ -214,7 +214,7 @@ cmih_walk_init(mdb_walk_state_t *wsp)
 	}
 
 	/* Look up the hdl of the first strand <0,0,0> */
-	wsp->walk_addr = NULL;
+	wsp->walk_addr = 0;
 	if ((ent = cmih_ent_lookup(awsp)) != NULL)
 		wsp->walk_addr = (uintptr_t)ent->cmae_hdlp;
 
@@ -225,14 +225,14 @@ static int
 cmih_walk_step(mdb_walk_state_t *wsp)
 {
 	struct cmih_walk_state *awsp = wsp->walk_data;
-	uintptr_t addr = NULL;
+	uintptr_t addr = 0;
 	cmi_hdl_impl_t hdl;
 	cmi_hdl_ent_t *ent;
 	int rv;
 
 	if ((ent = cmih_ent_lookup(awsp)) != NULL)
 		addr = (uintptr_t)ent->cmae_hdlp;
-	if (wsp->walk_addr == NULL || addr == NULL)
+	if (wsp->walk_addr == 0 || addr == 0)
 		return (cmih_ent_next(awsp) ? WALK_NEXT : WALK_DONE);
 
 	if (mdb_vread(&hdl, sizeof (hdl), addr) != sizeof (hdl)) {
@@ -493,13 +493,13 @@ cmihdl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 		mdb_free(buf, len);
 
-		cb.mod_hdladdr = NULL;
+		cb.mod_hdladdr = 0;
 		if (mdb_walk("cmihdl", cmihdl_cb, &cb) == -1) {
 			mdb_warn("cmi_hdl walk failed\n");
 			return (DCMD_ERR);
 		}
 
-		if (cb.mod_hdladdr == NULL) {
+		if (cb.mod_hdladdr == 0) {
 			if (cb.mod_cpuid != -1) {
 				mdb_warn("No handle found for cpuid %d\n",
 				    cb.mod_cpuid);
@@ -602,7 +602,7 @@ gcpu_mptwalk_init(mdb_walk_state_t *wsp)
 	uint_t nent, i;
 	hrtime_t latest;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		mdb_warn("the address of a poll trace array must be "
 		    "specified\n");
 		return (WALK_ERR);
diff --git a/usr/src/cmd/mdb/intel/modules/mdb_kb/mdb_kb.c b/usr/src/cmd/mdb/intel/modules/mdb_kb/mdb_kb.c
index e6429ac386..53055da760 100644
--- a/usr/src/cmd/mdb/intel/modules/mdb_kb/mdb_kb.c
+++ b/usr/src/cmd/mdb/intel/modules/mdb_kb/mdb_kb.c
@@ -919,7 +919,7 @@ xkb_walk_syms(xkb_t *xkb, uintptr_t modhead, char **buf,
 		    modctl + offsetof(struct modctl, mod_mp), &modulep))
 			return (0);
 
-		if (modulep == NULL)
+		if (modulep == 0)
 			goto next;
 
 		if (!xkb_read_module(xkb, modulep, &module, &sym_addr,
diff --git a/usr/src/cmd/mdb/intel/modules/sata/sata.c b/usr/src/cmd/mdb/intel/modules/sata/sata.c
index b1618cd8d8..1829ed2f19 100644
--- a/usr/src/cmd/mdb/intel/modules/sata/sata.c
+++ b/usr/src/cmd/mdb/intel/modules/sata/sata.c
@@ -53,7 +53,7 @@ sata_dmsg_walk_i(mdb_walk_state_t *wsp)
 	uintptr_t rbuf_addr;
 	sata_trace_rbuf_t rbuf;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == 0) {
 		if (mdb_readvar(&rbuf_addr, "sata_debug_rbuf") == -1) {
 			mdb_warn("failed to read 'sata_debug_rbuf'");
 			return (WALK_ERR);
@@ -87,7 +87,7 @@ sata_dmsg_walk_s(mdb_walk_state_t *wsp)
 {
 	int status;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == 0)
 		return (WALK_DONE);
 
 	if (mdb_vread(wsp->walk_data, sizeof (sata_trace_dmsg_t),
@@ -107,7 +107,7 @@ sata_dmsg_walk_s(mdb_walk_state_t *wsp)
 	 * If we've looped then we're done.
 	 */
 	if (wsp->walk_addr == (uintptr_t)wsp->walk_arg)
-		wsp->walk_addr = NULL;
+		wsp->walk_addr = 0;
 
 	return (status);
 }
@@ -224,7 +224,7 @@ sata_rbuf_dump(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	 * If ring buffer address not provided try to obtain
 	 * it using sata_debug_rbuf global.
 	 */
-	if ((addr == NULL) || !(flags & DCMD_ADDRSPEC)) {
+	if ((addr == 0) || !(flags & DCMD_ADDRSPEC)) {
 		if (mdb_readvar(&addr, "sata_debug_rbuf") == -1) {
 			mdb_warn("Failed to read 'sata_debug_rbuf'.");
 			return (DCMD_ERR);
diff --git a/usr/src/cmd/mdb/intel/modules/xhci/xhci.c b/usr/src/cmd/mdb/intel/modules/xhci/xhci.c
index 5633915918..b0d3dea253 100644
--- a/usr/src/cmd/mdb/intel/modules/xhci/xhci.c
+++ b/usr/src/cmd/mdb/intel/modules/xhci/xhci.c
@@ -585,7 +585,7 @@ xhci_mdb_walk_xhci_endpoint_step(mdb_walk_state_t *wsp)
 		return (WALK_DONE);
 
 	addr = (uintptr_t)xm->xmwe_device.xd_endpoints[xm->xmwe_ep];
-	if (addr != NULL) {
+	if (addr != 0) {
 		xhci_endpoint_t xe;
 
 		if (mdb_vread(&xe, sizeof (xe), addr) != sizeof (xe)) {
diff --git a/usr/src/cmd/mdb/tools/scripts/tigen.sh b/usr/src/cmd/mdb/tools/scripts/tigen.sh
index 58c97d8d8a..d74a55486b 100644
--- a/usr/src/cmd/mdb/tools/scripts/tigen.sh
+++ b/usr/src/cmd/mdb/tools/scripts/tigen.sh
@@ -145,7 +145,7 @@ for term in $termlist; do
 		echo "\t{ \"$attr\", $type, (void *)$data },"
 	done
 
-	echo "\t{ NULL, NULL, NULL }"
+	echo "\t{ NULL, 0, NULL }"
 	echo "};\n"
 
 	$verbose && echo "done" >& 2