[illumos-gate merge]

commit 52abb70e073c2a88808c0d66fd810ba8c5080572
    9691 fat zap should prefetch when iterating
commit 8648b7db4afb6cc9a8e5b55e38e99c8c64b74e86
    10435 dld: NULL pointer errors
commit c4b91d4b4753f33280a63b16f5116d23427088b1
    10444 linenoise: this statement may fall through
commit 584814c74382743e01cc62cc8764cfde61718c46
    10443 loader: move panic.c to libstand
commit c11cea93a9321bd25667986dc65a86b56de2ac04
    10441 hxge: NULL pointer errors
commit 1f14a912903a53cb5b4ed3f75e9e4d2be8ded1ba
    10440 ipd: NULL pointer errors
commit 2520aea3664a4259338aefa2aa4a4945654615c6
    10439 ecpp: NULL pointer errors
commit 55aeed12a7fb74469f7ea0fbb3d2329d4c8c96ae
    10438 fd: NULL pointer errors
commit 5c63ad82aeee3300425b5803b5324fd102047957
    10437 dca: NULL pointer errors
commit 8d3c0bf06dddf77026f7ea064cfccfae818b5b0f
    10434 dump: NULL pointer errors
commit a3f59f6e87a609ee4950ebfcf34be0cca305e58b
    10433 bpf: NULL pointer errors
commit 093aa5c8de00cc7b99cc4a2cfaeb7d95115847b7
    10432 devinfo: NULL pointer errors
commit a897f299fb4fe4ed74ba062d6b8984404d1b94bc
    10431 conskbd: NULL pointer errors
commit b63d0986fbd0638ed6abf1248f1a297c5d9a4f91
    10151 mv_xattrs() checks for a NULL array name
commit 5085a9e0a8c766d5e9b74954833264533f617614
    10369 sysent: cast between incompatible function types
commit ebc6491a5a66ba44ff1a3fa2a627e67d665604f0
    10163 ufs_fsck: bitwise comparison always evaluates to false

1 files changed, 12 insertions, 12 deletions

diff --git a/usr/src/uts/common/crypto/io/dca.c b/usr/src/uts/common/crypto/io/dca.c
index b76cbaeb55..015112ade4 100644
--- a/usr/src/uts/common/crypto/io/dca.c
+++ b/usr/src/uts/common/crypto/io/dca.c
@@ -664,8 +664,8 @@ dca_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	dca = ddi_get_soft_state(dca_state, instance);
 	ASSERT(dca != NULL);
 	dca->dca_dip = dip;
-	WORKLIST(dca, MCR1)->dwl_prov = NULL;
-	WORKLIST(dca, MCR2)->dwl_prov = NULL;
+	WORKLIST(dca, MCR1)->dwl_prov = 0;
+	WORKLIST(dca, MCR2)->dwl_prov = 0;
 	/* figure pagesize */
 	dca->dca_pagesize = ddi_ptob(dip, 1);
 
@@ -856,11 +856,11 @@ dca_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 
 failed:
 	/* unregister from the crypto framework */
-	if (WORKLIST(dca, MCR1)->dwl_prov != NULL) {
+	if (WORKLIST(dca, MCR1)->dwl_prov != 0) {
 		(void) crypto_unregister_provider(
 		    WORKLIST(dca, MCR1)->dwl_prov);
 	}
-	if (WORKLIST(dca, MCR2)->dwl_prov != NULL) {
+	if (WORKLIST(dca, MCR2)->dwl_prov != 0) {
 		(void) crypto_unregister_provider(
 		    WORKLIST(dca, MCR2)->dwl_prov);
 	}
@@ -925,7 +925,7 @@ dca_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 	 * Unregister from kCF.
 	 * This needs to be done at the beginning of detach.
 	 */
-	if (WORKLIST(dca, MCR1)->dwl_prov != NULL) {
+	if (WORKLIST(dca, MCR1)->dwl_prov != 0) {
 		if (crypto_unregister_provider(
 		    WORKLIST(dca, MCR1)->dwl_prov) != CRYPTO_SUCCESS) {
 			dca_error(dca, "unable to unregister MCR1 from kcf");
@@ -933,7 +933,7 @@ dca_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 		}
 	}
 
-	if (WORKLIST(dca, MCR2)->dwl_prov != NULL) {
+	if (WORKLIST(dca, MCR2)->dwl_prov != 0) {
 		if (crypto_unregister_provider(
 		    WORKLIST(dca, MCR2)->dwl_prov) != CRYPTO_SUCCESS) {
 			dca_error(dca, "unable to unregister MCR2 from kcf");
@@ -1243,7 +1243,7 @@ dca_uninit(dca_t *dca)
 		mutex_destroy(&wlp->dwl_freereqslock);
 		mutex_destroy(&wlp->dwl_freelock);
 		cv_destroy(&wlp->dwl_cv);
-		wlp->dwl_prov = NULL;
+		wlp->dwl_prov = 0;
 	}
 }
 
@@ -1927,7 +1927,7 @@ dca_bindchains(dca_request_t *reqp, size_t incnt, size_t outcnt)
 		reqp->dr_in_next = reqp->dr_chain_in_head.dc_next_paddr;
 		reqp->dr_in_len = reqp->dr_chain_in_head.dc_buffer_length;
 	} else {
-		reqp->dr_in_paddr = NULL;
+		reqp->dr_in_paddr = 0;
 		reqp->dr_in_next = 0;
 		reqp->dr_in_len = 0;
 	}
@@ -1960,7 +1960,7 @@ dca_bindchains(dca_request_t *reqp, size_t incnt, size_t outcnt)
 		reqp->dr_out_next = reqp->dr_chain_out_head.dc_next_paddr;
 		reqp->dr_out_len = reqp->dr_chain_out_head.dc_buffer_length;
 	} else {
-		reqp->dr_out_paddr = NULL;
+		reqp->dr_out_paddr = 0;
 		reqp->dr_out_next = 0;
 		reqp->dr_out_len = 0;
 	}
@@ -1978,7 +1978,7 @@ dca_unbindchains(dca_request_t *reqp)
 	int rv1 = DDI_SUCCESS;
 
 	/* Clear the input chain */
-	if (reqp->dr_chain_in_head.dc_buffer_paddr != NULL) {
+	if (reqp->dr_chain_in_head.dc_buffer_paddr != 0) {
 		(void) ddi_dma_unbind_handle(reqp->dr_chain_in_dmah);
 		reqp->dr_chain_in_head.dc_buffer_paddr = 0;
 	}
@@ -1988,7 +1988,7 @@ dca_unbindchains(dca_request_t *reqp)
 	}
 
 	/* Clear the output chain */
-	if (reqp->dr_chain_out_head.dc_buffer_paddr != NULL) {
+	if (reqp->dr_chain_out_head.dc_buffer_paddr != 0) {
 		(void) ddi_dma_unbind_handle(reqp->dr_chain_out_dmah);
 		reqp->dr_chain_out_head.dc_buffer_paddr = 0;
 	}
@@ -2011,7 +2011,7 @@ dca_bindchains_one(dca_request_t *reqp, size_t cnt, int dr_offset,
 	caddr_t			chain_kaddr_pre;
 	caddr_t			chain_kaddr;
 	uint32_t		chain_paddr;
-	int 			i;
+	int			i;
 
 	/* Advance past the context structure to the starting address */
 	chain_paddr = reqp->dr_ctx_paddr + dr_offset;