4 files changed, 10 insertions, 19 deletions

diff --git a/usr/src/cmd/mdb/sun4v/modules/errh/errh.c b/usr/src/cmd/mdb/sun4v/modules/errh/errh.c
index 6525746f3b..3554e1d559 100644
--- a/usr/src/cmd/mdb/sun4v/modules/errh/errh.c
+++ b/usr/src/cmd/mdb/sun4v/modules/errh/errh.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>
@@ -208,14 +206,13 @@ errh_prtaddr(uintptr_t addr, const void *data, void *private)
 	return (WALK_NEXT);
 }
 
-/*ARGSUSED*/
 int
 rq_walk_init(mdb_walk_state_t *wsp)
 {
 	cpu_t cpu;
 	uintptr_t *ao, *lower, *upper;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == (uintptr_t)NULL) {
 		mdb_warn("address of struct cpu_t is required\n");
 		return (WALK_ERR);
 	}
@@ -245,14 +242,13 @@ rq_walk_init(mdb_walk_state_t *wsp)
 	return (WALK_NEXT);
 }
 
-/*ARGSUSED*/
 int
 nrq_walk_init(mdb_walk_state_t *wsp)
 {
 	cpu_t cpu;
 	uintptr_t *ao, *lower, *upper;
 
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == (uintptr_t)NULL) {
 		mdb_warn("address of struct cpu_t is required\n");
 		return (WALK_ERR);
 	}
@@ -282,14 +278,13 @@ nrq_walk_init(mdb_walk_state_t *wsp)
 	return (WALK_NEXT);
 }
 
-/*ARGSUSED*/
 int
 errh_walk_step(mdb_walk_state_t *wsp)
 {
 	int status;
 	uintptr_t *ao, *lower, *upper;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == (uintptr_t)NULL)
 		return (WALK_DONE);
 
 	status = wsp->walk_callback(wsp->walk_addr, wsp->walk_data,
diff --git a/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c b/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c
index 8cd92bc435..766f799e6e 100644
--- a/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c
+++ b/usr/src/cmd/mdb/sun4v/modules/ldc/ldc.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This module provides debugging tools for the LDoms channels (ldc)
  */
@@ -233,13 +231,13 @@ ldc_walk_init(mdb_walk_state_t *wsp)
 	ldc_soft_state_t	softstate;
 
 	/* Must have a start addr.  */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == (uintptr_t)NULL) {
 		if (mdb_readvar(&wsp->walk_addr, "ldcssp") == -1) {
 			mdb_warn("failed to read 'ldcssp'");
 			return (WALK_ERR);
 		}
 
-		if (wsp->walk_addr == NULL)
+		if (wsp->walk_addr == (uintptr_t)NULL)
 			return (WALK_DONE);
 
 		if (mdb_vread(&softstate, sizeof (softstate), wsp->walk_addr)
@@ -263,7 +261,7 @@ ldc_walk_step(mdb_walk_state_t *wsp)
 	int			status;
 	ldc_chan_t		ldcp;
 
-	if (wsp->walk_addr == NULL)
+	if (wsp->walk_addr == (uintptr_t)NULL)
 		return (WALK_DONE);
 
 	if (mdb_vread(&ldcp, sizeof (ldc_chan_t), wsp->walk_addr) == -1) {
@@ -289,7 +287,7 @@ int
 ldcmsg(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	ldc_msg_t	msg;
-	uint64_t 	count = 1;
+	uint64_t	count = 1;
 	int		i;
 
 	/*
@@ -476,7 +474,7 @@ ldcmhdl(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 			mdb_printf("\n");
 		}
 
-		if ((addr = (uintptr_t)mhdl.next) == NULL)
+		if ((addr = (uintptr_t)mhdl.next) == (uintptr_t)NULL)
 			break;
 	}
 
diff --git a/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c b/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c
index d0184bc7c8..b2c791690e 100644
--- a/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c
+++ b/usr/src/cmd/mdb/sun4v/modules/mdesc/mdesc.c
@@ -68,7 +68,7 @@ mdhdr(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		else
 			mdb_printf("%p\n", mdp);
 
-	} while ((mdp = (uintptr_t)md.next) != NULL);
+	} while ((mdp = (uintptr_t)md.next) != (uintptr_t)NULL);
 
 	return (DCMD_OK);
 }
diff --git a/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c b/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c
index b43c3f9d95..c404a3fb98 100644
--- a/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c
+++ b/usr/src/cmd/mdb/sun4v/modules/vdsk/vdsk.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This module provides debugging tools for the LDoms vDisk drivers
  * (vds and vdc).
@@ -41,7 +39,7 @@ int
 vd_dring_entry_walk_init(mdb_walk_state_t *wsp)
 {
 	/* Must have a start addr.  */
-	if (wsp->walk_addr == NULL) {
+	if (wsp->walk_addr == (uintptr_t)NULL) {
 		mdb_warn("Descriptor Ring base address required\n");
 
 		return (WALK_ERR);