[illumos-gate merge]

commit 7957da45b8e66b8cd6e917ac6bd8965817d7ef06
    10144 BZ2_bzDecompressReset() gets NULL check wrong
commit a8b4e7c71a6c1ef07e77c48dbb92fcdc8624266d
    10424 uts: NULL pointer errors in DEBUG build
commit f1ccfd86d00d3a46fa8dc85b88860e10a3ad1019
    10423 bridge: cast between incompatible function types
commit fb05fcb92e04bd3719e79f64be4c3432c2f1a119
    10422 conskbd: cast between incompatible function types
commit 98bfe312451089fb99dd3ccde47363ce4d275459
    10420 consms: cast between incompatible function types
commit 336380cbc80cdb79336de7f2b9a5d418c0991618
    10383 myri10ge: NULL pointer errors
commit 0333c43738b2582094bb2644c0a1f4211751447b
    10364 vnode: cast between incompatible function types
commit af34582fe571c99d9f74acf7c271e26c744fef5b
    10416 zoneadmd leaves trailing comma on link address
commit ffe245b40fe1731e6f0ea5c097a74eb78bc839e2
    10415 Memory leak in ipadm_zone_get_network()
commit b9e319bfd413f32cc39ec7b8ccc527f35712da7f
    10419 ntxn: cast between incompatible function types
commit 4fa33403ece8f42c56cba2b672d10f6ab4dc32cd
    10418 chxge: cast between incompatible function types
commit 888d78e951c54427c93b8ef788383952b9c63687
    10410 kmdb: set terminal window size
commit 3ab29d2187aaeb14feecd145834ac2f151dc822c
    10378 agpgart: NULL pointer errors
commit 7e12ceb3ebc63aeb71e91b496032ca22ca55f660
    10376 uts: NULL pointer issues in genunix
commit 7e897d1fc847b22dc338da9a5a59dae0cd8765de
    10373 vm_anon: cast between incompatible function types
commit 735c423ad1b2b03125a2c8d3840540d6b17f7dbf
    10372 vmem: cast between incompatible function types
commit b6d49c8438f976a7c4a6c9390228076c8f132847
    10371 vfs: cast between incompatible function types
commit d0cb1fb92629bc0283c88d4719df7285c1612700
    9425 allow channel programs to be stopped via signals
commit 9d1587b49e4692b8d6652e6c0b113a53b1af5313
    10124 smatch fixes for cryptoadm

	Conflicts:
	usr/src/cmd/zoneadmd/vplat.c

4 files changed, 9 insertions, 9 deletions

diff --git a/usr/src/uts/common/syscall/lgrpsys.c b/usr/src/uts/common/syscall/lgrpsys.c
index be60d1a445..34bd08fd12 100644
--- a/usr/src/uts/common/syscall/lgrpsys.c
+++ b/usr/src/uts/common/syscall/lgrpsys.c
@@ -182,7 +182,7 @@ meminfo(int addr_count, struct meminfo *mip)
 				out_array[i] = lgrp->lgrp_id;
 				val_array[i] = VALID_ADDR | VALID_REQ;
 			} else {
-				out_array[i] = NULL;
+				out_array[i] = 0;
 				val_array[i] = 0;
 			}
 		}
@@ -1857,7 +1857,7 @@ lgrp_snapshot_copy32(caddr32_t buf, size32_t bufsize)
 	snap_size = snap_hdr_size + info_size + cpuids_size + bitmasks_size +
 	    lats_size;
 
-	if (buf == NULL || bufsize <= 0) {
+	if (buf == 0 || bufsize <= 0) {
 		return (snap_size);
 	}
 
diff --git a/usr/src/uts/common/syscall/lwp_create.c b/usr/src/uts/common/syscall/lwp_create.c
index 53ecd8c5e2..361654cabb 100644
--- a/usr/src/uts/common/syscall/lwp_create.c
+++ b/usr/src/uts/common/syscall/lwp_create.c
@@ -126,7 +126,7 @@ syslwp_create(ucontext_t *ucp, int flags, id_t *new_lwp)
 	mutex_enter(&curproc->p_lock);
 	pool_barrier_enter();
 	mutex_exit(&curproc->p_lock);
-	lwp = lwp_create(lwp_rtt, NULL, NULL, curproc, TS_STOPPED,
+	lwp = lwp_create(lwp_rtt, NULL, 0, curproc, TS_STOPPED,
 	    curthread->t_pri, &sigmask, curthread->t_cid, 0);
 	mutex_enter(&curproc->p_lock);
 	pool_barrier_exit();
diff --git a/usr/src/uts/common/syscall/poll.c b/usr/src/uts/common/syscall/poll.c
index 2eb50323a0..2214bacaf8 100644
--- a/usr/src/uts/common/syscall/poll.c
+++ b/usr/src/uts/common/syscall/poll.c
@@ -486,12 +486,12 @@ poll_common(pollstate_t *ps, pollfd_t *fds, nfds_t nfds, timespec_t *tsp,
 
 			/*
 			 * Note that pcs_usradr field of an used entry won't be
-			 * NULL because it stores the address of passed-in fds,
-			 * and NULL fds will not be cached (Then it is either
+			 * 0 because it stores the address of passed-in fds,
+			 * and 0 fds will not be cached (Then it is either
 			 * the special timeout case when nfds is 0 or it returns
 			 * failure directly).
 			 */
-			if (pcset[cacheindex].pcs_usradr == NULL) {
+			if (pcset[cacheindex].pcs_usradr == (uintptr_t)NULL) {
 				/*
 				 * found an unused entry. Use it to cache
 				 * this poll list.
@@ -2223,7 +2223,7 @@ pcacheset_cache_list(pollstate_t *ps, pollfd_t *fds, int *fdcntp, int which)
 			pcacheset_remove_list(ps, pollfdp, 0, i, which, 0);
 			kmem_free(newfdlist, ps->ps_nfds * sizeof (pollfd_t));
 			pcacheset[which].pcs_pollfd = NULL;
-			pcacheset[which].pcs_usradr = NULL;
+			pcacheset[which].pcs_usradr = (uintptr_t)NULL;
 			break;
 		}
 	}
diff --git a/usr/src/uts/common/syscall/uadmin.c b/usr/src/uts/common/syscall/uadmin.c
index bf31c3dcd6..dfe7f22d44 100644
--- a/usr/src/uts/common/syscall/uadmin.c
+++ b/usr/src/uts/common/syscall/uadmin.c
@@ -282,7 +282,7 @@ kadmin(int cmd, int fcn, void *mdep, cred_t *credp)
 		 * vfs_syncall() can acquire the vfs locks they need.
 		 */
 		sema_p(&fsflush_sema);
-		(void) callb_execute_class(CB_CL_UADMIN_PRE_VFS, NULL);
+		(void) callb_execute_class(CB_CL_UADMIN_PRE_VFS, 0);
 
 		vfs_unmountall();
 		(void) VFS_MOUNTROOT(rootvfs, ROOT_UNMOUNT);
@@ -444,7 +444,7 @@ uadmin(int cmd, int fcn, uintptr_t mdep)
 	 * Certain subcommands intepret a non-NULL mdep value as a pointer to
 	 * a boot string.  We pull that in as bootargs, if applicable.
 	 */
-	if (mdep != NULL &&
+	if (mdep != (uintptr_t)NULL &&
 	    (cmd == A_SHUTDOWN || cmd == A_REBOOT || cmd == A_DUMP ||
 	    cmd == A_FREEZE || cmd == A_CONFIG)) {
 		bootargs = kmem_zalloc(BOOTARGS_MAX, KM_SLEEP);