[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

3 files changed, 15 insertions, 15 deletions

diff --git a/usr/src/uts/common/vm/hat_refmod.c b/usr/src/uts/common/vm/hat_refmod.c
index ad15becea4..31a85d4cf6 100644
--- a/usr/src/uts/common/vm/hat_refmod.c
+++ b/usr/src/uts/common/vm/hat_refmod.c
@@ -230,7 +230,7 @@ hat_freestat(struct as *as, int id)
 	mutex_enter(&hat_statlock);
 
 	for (prev_ahrm = NULL; hrm; hrm = hrm->hrm_anext) {
-		if ((id == hrm->hrm_id) || (id == NULL)) {
+		if ((id == hrm->hrm_id) || (id == 0)) {
 
 			hrm_hashout(hrm);
 			hrm->hrm_hnext = hrm_blist;
diff --git a/usr/src/uts/common/vm/seg_kp.c b/usr/src/uts/common/vm/seg_kp.c
index d33ff004f1..02c844bff6 100644
--- a/usr/src/uts/common/vm/seg_kp.c
+++ b/usr/src/uts/common/vm/seg_kp.c
@@ -1357,7 +1357,7 @@ swapsize(caddr_t v)
 	if ((kpd = segkp_find(segkp, v)) != NULL)
 		return (SEGKP_MAPLEN(kpd->kp_len, kpd->kp_flags));
 	else
-		return (NULL);
+		return (0);
 }
 
 /*
diff --git a/usr/src/uts/common/vm/vm_anon.c b/usr/src/uts/common/vm/vm_anon.c
index 01db9b23d7..6ca64f77da 100644
--- a/usr/src/uts/common/vm/vm_anon.c
+++ b/usr/src/uts/common/vm/vm_anon.c
@@ -24,7 +24,7 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -512,9 +512,8 @@ anon_set_ptr(struct anon_hdr *ahp, ulong_t an_idx, struct anon *ap, int flags)
  * Copy anon array into a given new anon array
  */
 int
-anon_copy_ptr(struct anon_hdr *sahp, ulong_t s_idx,
-	struct anon_hdr *dahp, ulong_t d_idx,
-	pgcnt_t npages, int flags)
+anon_copy_ptr(struct anon_hdr *sahp, ulong_t s_idx, struct anon_hdr *dahp,
+    ulong_t d_idx, pgcnt_t npages, int flags)
 {
 	void **sapp, **dapp;
 	void *ap;
@@ -770,9 +769,9 @@ set_anoninfo(void)
  * reserve swap space, we need to check memory-based as well
  * as disk-backed (physical) swap.  The following algorithm
  * is used:
- * 	Check the space on physical swap
- * 		i.e. amount needed < ani_max - ani_phys_resv
- * 	If we are swapping on swapfs check
+ *	Check the space on physical swap
+ *		i.e. amount needed < ani_max - ani_phys_resv
+ *	If we are swapping on swapfs check
  *		amount needed < (availrmem - swapfs_minfree)
  * Since the algorithm to check for the quantity of swap space is
  * almost the same as that for reserving it, we'll just use anon_resvmem
@@ -1273,7 +1272,8 @@ anon_decref_pages(
 					if (ap->an_pvp != NULL &&
 					    !vn_matchopval(ap->an_pvp,
 					    VOPNAME_DISPOSE,
-					    (fs_generic_func_p)fs_dispose))
+					    (fs_generic_func_p)(uintptr_t)
+					    fs_dispose))
 						dispose = 1;
 				}
 				for (j = i; j < i + curpgcnt; j++) {
@@ -1339,7 +1339,7 @@ anon_decref_pages(
  */
 void
 anon_dup(struct anon_hdr *old, ulong_t old_idx, struct anon_hdr *new,
-			ulong_t new_idx, size_t size)
+    ulong_t new_idx, size_t size)
 {
 	spgcnt_t npages;
 	kmutex_t *ahm;
@@ -3205,7 +3205,7 @@ anon_map_demotepages(
 	pgcnt_t		i, pg_idx;
 	ulong_t		an_idx;
 	caddr_t		vaddr;
-	int 		err;
+	int		err;
 	int		retry = 0;
 	uint_t		vpprot;
 
@@ -3453,7 +3453,7 @@ anonmap_free(struct anon_map *amp)
  */
 int
 non_anon(struct anon_hdr *ahp, ulong_t anon_idx, u_offset_t *offp,
-				size_t *lenp)
+    size_t *lenp)
 {
 	ulong_t i, el;
 	ssize_t low, high;
@@ -3571,7 +3571,7 @@ ulong_t *
 anon_get_slot(struct anon_hdr *ahp, ulong_t an_idx)
 {
 	struct anon	**app;
-	void 		**ppp;
+	void		**ppp;
 
 	ASSERT(an_idx < ahp->size);
 
@@ -3630,7 +3630,7 @@ anon_array_enter(struct anon_map *amp, ulong_t an_idx, anon_sync_obj_t *sobj)
 
 int
 anon_array_try_enter(struct anon_map *amp, ulong_t an_idx,
-			anon_sync_obj_t *sobj)
+    anon_sync_obj_t *sobj)
 {
 	ulong_t		*ap_slot;
 	kmutex_t	*mtx;