2 files changed, 10 insertions, 10 deletions

diff --git a/usr/src/uts/common/os/brand.c b/usr/src/uts/common/os/brand.c
index 0af67f5d98..773ecc9c6a 100644
--- a/usr/src/uts/common/os/brand.c
+++ b/usr/src/uts/common/os/brand.c
@@ -834,19 +834,19 @@ brand_solaris_elfexec(vnode_t *vp, execa_t *uap, uarg_t *args,
 			 */
 			sedp->sed_ldentry = ehdr.e_entry;
 			sedp->sed_entry = ehdr.e_entry;
-			sedp->sed_lddata = NULL;
-			sedp->sed_base = NULL;
+			sedp->sed_lddata = 0;
+			sedp->sed_base = 0;
 		} else {
 			/*
 			 * A shared object with no interpreter, we use
 			 * the calculated address from above.
 			 */
 			sedp->sed_ldentry = sedp->sed_entry;
-			sedp->sed_entry = NULL;
-			sedp->sed_phdr = NULL;
-			sedp->sed_phent = NULL;
-			sedp->sed_phnum = NULL;
-			sedp->sed_lddata = NULL;
+			sedp->sed_entry = 0;
+			sedp->sed_phdr = 0;
+			sedp->sed_phent = 0;
+			sedp->sed_phnum = 0;
+			sedp->sed_lddata = 0;
 			sedp->sed_base = voffset;
 
 			if (ehdr.e_type == ET_DYN) {
@@ -980,7 +980,7 @@ brand_solaris_elfexec(vnode_t *vp, execa_t *uap, uarg_t *args,
 		}
 
 		up->u_auxv[i].a_un.a_val = val;
-		if (val == NULL) {
+		if (val == 0) {
 			/* Hide the entry for static binaries */
 			up->u_auxv[i].a_type = AT_IGNORE;
 		}
diff --git a/usr/src/uts/common/os/panic.c b/usr/src/uts/common/os/panic.c
index 09dc058fd8..62be47e843 100644
--- a/usr/src/uts/common/os/panic.c
+++ b/usr/src/uts/common/os/panic.c
@@ -178,7 +178,7 @@ char panic_preempt;			/* t_preempt for panic_thread */
  */
 char *panic_bootstr = NULL;		/* mdboot string to use after panic */
 int panic_bootfcn = AD_BOOT;		/* mdboot function to use after panic */
-int halt_on_panic = 0;  		/* halt after dump instead of reboot? */
+int halt_on_panic = 0;			/* halt after dump instead of reboot? */
 int nopanicdebug = 0;			/* reboot instead of call debugger? */
 int in_sync = 0;			/* skip vfs_syncall() and just dump? */
 
@@ -311,7 +311,7 @@ panicsys(const char *format, va_list alist, struct regs *rp, int on_panic_stack)
 		splx(ipltospl(CLOCK_LEVEL));
 		panic_quiesce_hw(pdp);
 		(void) FTRACE_STOP();
-		(void) callb_execute_class(CB_CL_PANIC, NULL);
+		(void) callb_execute_class(CB_CL_PANIC, 0);
 
 		if (log_intrq != NULL)
 			log_flushq(log_intrq);