3 files changed, 11 insertions, 11 deletions

diff --git a/usr/src/uts/intel/dtrace/dtrace_isa.c b/usr/src/uts/intel/dtrace/dtrace_isa.c
index f52180b0c0..ee87d5feb9 100644
--- a/usr/src/uts/intel/dtrace/dtrace_isa.c
+++ b/usr/src/uts/intel/dtrace/dtrace_isa.c
@@ -85,7 +85,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 		}
 
 		if (aframes > 0) {
-			if (--aframes == 0 && caller != NULL) {
+			if (--aframes == 0 && caller != 0) {
 				/*
 				 * We've just run out of artificial frames,
 				 * and we have a valid caller -- fill it in
@@ -93,7 +93,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 				 */
 				ASSERT(depth < pcstack_limit);
 				pcstack[depth++] = (pc_t)caller;
-				caller = NULL;
+				caller = 0;
 			}
 		} else {
 			if (depth < pcstack_limit)
@@ -102,7 +102,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
 
 		if (last) {
 			while (depth < pcstack_limit)
-				pcstack[depth++] = NULL;
+				pcstack[depth++] = 0;
 			return;
 		}
 
@@ -263,7 +263,7 @@ dtrace_getupcstack(uint64_t *pcstack, int pcstack_limit)
 
 zero:
 	while (pcstack_limit-- > 0)
-		*pcstack++ = NULL;
+		*pcstack++ = 0;
 }
 
 int
@@ -407,7 +407,7 @@ dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit)
 
 zero:
 	while (pcstack_limit-- > 0)
-		*pcstack++ = NULL;
+		*pcstack++ = 0;
 }
 
 /*ARGSUSED*/
diff --git a/usr/src/uts/intel/dtrace/fbt.c b/usr/src/uts/intel/dtrace/fbt.c
index b9353bd30c..5df2d8b803 100644
--- a/usr/src/uts/intel/dtrace/fbt.c
+++ b/usr/src/uts/intel/dtrace/fbt.c
@@ -117,7 +117,7 @@ fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval)
 				dtrace_probe(fbt->fbtp_id, stack0, stack1,
 				    stack2, stack3, stack4);
 
-				CPU->cpu_dtrace_caller = NULL;
+				CPU->cpu_dtrace_caller = 0;
 			} else {
 #ifdef __amd64
 				/*
@@ -134,7 +134,7 @@ fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval)
 
 				dtrace_probe(fbt->fbtp_id, fbt->fbtp_roffset,
 				    rval, 0, 0, 0);
-				CPU->cpu_dtrace_caller = NULL;
+				CPU->cpu_dtrace_caller = 0;
 			}
 
 			return (fbt->fbtp_rval);
@@ -183,7 +183,7 @@ fbt_provide_module(void *arg, struct modctl *ctl)
 	if (strcmp(modname, "kmdbmod") == 0)
 		return;
 
-	if (str == NULL || symhdr == NULL || symhdr->sh_addr == NULL) {
+	if (str == NULL || symhdr == NULL || symhdr->sh_addr == 0) {
 		/*
 		 * If this module doesn't (yet) have its string or symbol
 		 * table allocated, clear out.
@@ -264,7 +264,7 @@ fbt_provide_module(void *arg, struct modctl *ctl)
 		 * In order to be eligible, the function must begin with the
 		 * following sequence:
 		 *
-		 * 	pushl	%esp
+		 *	pushl	%esp
 		 *	movl	%esp, %ebp
 		 *
 		 * Note that there are two variants of encodings that generate
@@ -721,7 +721,7 @@ fbt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	dtrace_invop_add(fbt_invop);
 
 	if (ddi_create_minor_node(devi, "fbt", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE ||
+	    DDI_PSEUDO, 0) == DDI_FAILURE ||
 	    dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_KERNEL, NULL,
 	    &fbt_pops, NULL, &fbt_id) != 0) {
 		fbt_cleanup(devi);
diff --git a/usr/src/uts/intel/dtrace/sdt.c b/usr/src/uts/intel/dtrace/sdt.c
index e98f6a30c0..3c84aeed5c 100644
--- a/usr/src/uts/intel/dtrace/sdt.c
+++ b/usr/src/uts/intel/dtrace/sdt.c
@@ -406,7 +406,7 @@ sdt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	sdt_provider_t *prov;
 
 	if (ddi_create_minor_node(devi, "sdt", S_IFCHR,
-	    0, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    0, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		cmn_err(CE_NOTE, "/dev/sdt couldn't create minor node");
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);