Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

23 files changed, 83 insertions, 83 deletions

diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index b101abf..c5e3172 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -174,7 +174,7 @@ atm_cm_connect(epp, token, ap, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+	cop = uma_zalloc(atm_connection_zone, 0);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -405,7 +405,7 @@ atm_cm_connect(epp, token, ap, copp)
 	/*
 	 * Get a connection VCC block
 	 */
-	cvp = uma_zalloc(atm_connvc_zone, M_WAITOK);
+	cvp = uma_zalloc(atm_connvc_zone, 0);
 	if (cvp == NULL) {
 		err = ENOMEM;
 		goto donex;
@@ -551,7 +551,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+	cop = uma_zalloc(atm_connection_zone, 0);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -710,7 +710,7 @@ atm_cm_listen(epp, token, ap, copp)
 	/*
 	 * Get an attribute block and save listening attributes
 	 */
-	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_WAITOK | M_ZERO);
+	cop->co_lattr = uma_zalloc(atm_attributes_zone, M_ZERO);
 	if (cop->co_lattr == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -815,7 +815,7 @@ atm_cm_addllc(epp, token, llc, ecop, copp)
 	/*
 	 * Get a connection block
 	 */
-	cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+	cop = uma_zalloc(atm_connection_zone, 0);
 	if (cop == NULL)
 		return (ENOMEM);
 
@@ -1266,7 +1266,7 @@ atm_cm_incoming(vcp, ap)
 	/*
 	 * Get a connection VCC block
 	 */
-	cvp = uma_zalloc(atm_connvc_zone, M_WAITOK);
+	cvp = uma_zalloc(atm_connvc_zone, 0);
 	if (cvp == NULL) {
 		err = ENOMEM;
 		goto fail;
@@ -1584,7 +1584,7 @@ atm_cm_incall(cvp)
 			/*
 			 * Need a new connection block
 			 */
-			cop = uma_zalloc(atm_connection_zone, M_WAITOK);
+			cop = uma_zalloc(atm_connection_zone, 0);
 			if (cop == NULL) {
 				cvp->cvc_attr.cause = atm_cause_tmpl;
 				cvp->cvc_attr.cause.v.cause_value =
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index c85303e..959c61c 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -170,7 +170,7 @@ atm_dev_inst(ssp, cvcp)
 	/*
 	 * Allocate a VCC control block
 	 */
-	cvp = uma_zalloc(cup->cu_vcc_zone, M_WAITOK);
+	cvp = uma_zalloc(cup->cu_vcc_zone, 0);
 	if (cvp == NULL)
 		return (ENOMEM);
 	
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index 69c9082..a93d566 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -496,7 +496,7 @@ atm_physif_ioctl(code, data, arg)
 		 */
 		for ( count = 0; count < asr->asr_nif_cnt; count++ )
 		{
-			nip = uma_zalloc(cup->cu_nif_zone, M_WAITOK | M_ZERO);
+			nip = uma_zalloc(cup->cu_nif_zone, M_ZERO);
 			if ( nip == NULL )
 			{
 				/*
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 6ff6abc..3c0b806 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -596,7 +596,7 @@ atm_sock_sockaddr(so, addr)
 	/*
 	 * Return local interface address, if known
 	 */
-	satm = malloc(sizeof(*satm), M_SONAME, M_WAITOK | M_ZERO);
+	satm = malloc(sizeof(*satm), M_SONAME, M_ZERO);
 	if (satm == NULL)
 		return (ENOMEM);
 
@@ -654,7 +654,7 @@ atm_sock_peeraddr(so, addr)
 	/*
 	 * Return remote address, if known
 	 */
-	satm = malloc(sizeof(*satm), M_SONAME, M_WAITOK | M_ZERO);
+	satm = malloc(sizeof(*satm), M_SONAME, M_ZERO);
 	if (satm == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 49dbf48..5dca971 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -124,7 +124,7 @@ ipatm_nifstat(cmd, nip, arg)
 		/*
 		 * Get a new interface block
 		 */
-		inp = uma_zalloc(ipatm_nif_zone, M_WAITOK);
+		inp = uma_zalloc(ipatm_nif_zone, 0);
 		if (inp == NULL) {
 			err = ENOMEM;
 			break;
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 14cf7cc..76c8a55 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -382,7 +382,7 @@ ipatm_openpvc(pvp, sivp)
 	/*
 	 * Allocate IP VCC block
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+	ivp = uma_zalloc(ipatm_vc_zone, 0);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -585,7 +585,7 @@ ipatm_createsvc(ifp, daf, dst, sivp)
 	/*
 	 * Allocate IP VCC
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+	ivp = uma_zalloc(ipatm_vc_zone, 0);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -937,7 +937,7 @@ ipatm_incoming(tok, cop, ap, tokp)
 	/*
 	 * Allocate IP VCC
 	 */
-	ivp = uma_zalloc(ipatm_vc_zone, M_WAITOK);
+	ivp = uma_zalloc(ipatm_vc_zone, 0);
 	if (ivp == NULL) {
 		err = ENOMEM;
 		cause = T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE;
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index df599ad..d11bd40 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -126,8 +126,8 @@
 #include <sys/mbuf.h>
 typedef struct mbuf	KBuffer;
 
-#define	KB_F_WAIT	M_TRYWAIT
-#define	KB_F_NOWAIT	M_DONTWAIT
+#define	KB_F_WAIT	0
+#define	KB_F_NOWAIT	M_NOWAIT
 
 #define	KB_T_HEADER	MT_HEADER
 #define	KB_T_DATA	MT_DATA
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 4c3196e..b0a4da5 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -122,7 +122,7 @@ sigpvc_create_pvc(pvp, cvp, errp)
 	/*
 	 * Allocate control block for PVC
 	 */
-	vcp = uma_zalloc(sigpvc_vc_zone, M_WAITOK | M_ZERO);
+	vcp = uma_zalloc(sigpvc_vc_zone, M_ZERO);
 	if (vcp == NULL) {
 		*errp = ENOMEM;
 		return (CALL_FAILED);
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index e0c83f9..7fb5a10 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -172,7 +172,7 @@ spansarp_svcout(ivp, dst)
 	/*
 	 * Now get the new arp entry
 	 */
-	sap = uma_zalloc(spansarp_zone, M_WAITOK);
+	sap = uma_zalloc(spansarp_zone, 0);
 	if (sap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
@@ -720,7 +720,7 @@ spansarp_input(clp, m)
 		/*
 		 * Source unknown and we're the target - add new entry
 		 */
-		sap = uma_zalloc(spansarp_zone, M_WAITOK);
+		sap = uma_zalloc(spansarp_zone, 0);
 		if (sap) {
 			sap->sa_dstip.s_addr = in_src.s_addr;
 			sap->sa_dstatm.address_format = T_ATM_SPANS_ADDR;
@@ -961,7 +961,7 @@ spansarp_ioctl(code, data, arg1)
 			/*
 			 * No, get a new arp entry
 			 */
-			sap = uma_zalloc(spansarp_zone, M_WAITOK);
+			sap = uma_zalloc(spansarp_zone, 0);
 			if (sap == NULL) {
 				err = ENOMEM;
 				break;
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 5b93892..a719678 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -348,7 +348,7 @@ spanscls_attach(spp)
 	/*
 	 * Get a new cls control block
 	 */
-	clp = uma_zalloc(spanscls_zone, M_WAITOK);
+	clp = uma_zalloc(spanscls_zone, 0);
 	if (clp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index c597080..89185bd 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -232,7 +232,7 @@ spans_send_open_req(spp, svp)
 	/*
 	 * Get memory for a request message
 	 */
-	req = uma_zalloc(spans_msg_zone, M_WAITOK);
+	req = uma_zalloc(spans_msg_zone, 0);
 	if (req == NULL) {
 		err = ENOBUFS;
 		goto done;
@@ -290,7 +290,7 @@ spans_send_open_rsp(spp, svp, result)
 	/*
 	 * Get memory for a response message
 	 */
-	rsp = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp = uma_zalloc(spans_msg_zone, 0);
 	if (rsp == NULL)
 		return(ENOBUFS);
 
@@ -340,7 +340,7 @@ spans_send_close_req(spp, svp)
 	/*
 	 * Get memory for a close request
 	 */
-	req = uma_zalloc(spans_msg_zone, M_WAITOK);
+	req = uma_zalloc(spans_msg_zone, 0);
 	if (req == NULL) {
 		err = ENOBUFS;
 		goto done;
@@ -468,7 +468,7 @@ spans_status_ind(spp, msg)
 	 * Respond to the status request or indication with a
 	 * status response
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 	rsp_msg->sm_vers = SPANS_VERS_1_0;
@@ -658,7 +658,7 @@ spans_open_req(spp, msg)
 	/*
 	 * Get a new VCCB for the connection
 	 */
-	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
+	svp = uma_zalloc(spans_vc_zone, 0);
 	if (svp == NULL) {
 		ATM_DEBUG0("spans_open_req: VCCB pool empty\n");
 		result = SPANS_NORSC;
@@ -808,7 +808,7 @@ response:
 	 * Some problem was detected with the request.  Send a SPANS
 	 * message rejecting the connection.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1034,7 +1034,7 @@ response:
 	/*
 	 * Respond to the SPANS_CLOSE_IND with a SPANS_CLOSE_RSP
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 	rsp_msg->sm_vers = SPANS_VERS_1_0;
@@ -1169,7 +1169,7 @@ spans_multi_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_MULTI_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1215,7 +1215,7 @@ spans_add_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_ADD_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1262,7 +1262,7 @@ spans_join_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_JOIN_CNF message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1307,7 +1307,7 @@ spans_leave_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_LEAVE_CNF message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1401,7 +1401,7 @@ spans_query_req(spp, msg)
 	/*
 	 * Get memory for a SPANS_QUERY_RSP message.
 	 */
-	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	rsp_msg = uma_zalloc(spans_msg_zone, 0);
 	if (rsp_msg == NULL)
 		return;
 
@@ -1489,7 +1489,7 @@ spans_rcv_msg(spp, m)
 	/*
 	 * Get storage for the message
 	 */
-	msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+	msg = uma_zalloc(spans_msg_zone, 0);
 	if (msg == NULL)
 		return;
 
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 7562820..8f96374 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -279,7 +279,7 @@ spans_timer(tip)
 		/*
 		 * Send out SPANS_STAT_REQ message
 		 */
-		msg = uma_zalloc(spans_msg_zone, M_WAITOK);
+		msg = uma_zalloc(spans_msg_zone, 0);
 		if (msg == NULL) {
 			/* XXX arr: This is bogus and will go away RSN */
 			/* Retry later if no memory */
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 93ea6d4..24edec2 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -192,7 +192,7 @@ spans_open_vcc(spp, cvp)
 	/*
 	 * Allocate control block for VCC
 	 */
-	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
+	svp = uma_zalloc(spans_vc_zone, 0);
 	if (svp == NULL) {
 		return(ENOMEM);
 	}
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index b5ff7d0..a0c3d67 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -213,7 +213,7 @@ sscf_uni_inst(ssp, cvp)
 	/*
 	 * Allocate our control block
 	 */
-	uvp = uma_zalloc(sscf_uni_zone, M_WAITOK);
+	uvp = uma_zalloc(sscf_uni_zone, 0);
 	if (uvp == NULL)
 		return (ENOMEM);
 	uvp->uv_ustate = UVU_INST;
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 6374f30..e555307 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -258,7 +258,7 @@ sscop_inst(ssp, cvp)
 	/*
 	 * Allocate our control block
 	 */
-	sop = uma_zalloc(sscop_zone, M_WAITOK);
+	sop = uma_zalloc(sscop_zone, 0);
 	if (sop == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 0de56b8..e946937 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -713,7 +713,7 @@ uniarp_client_mode(uip, aap)
 	 * Now, get an arp entry for the server connection
 	 */
 	uip->uip_arpstate = UIAS_CLIENT_POPEN;
-	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_ZERO);
 	if (uap == NULL) {
 		UNIIP_ARP_TIMER(uip, 1 * ATM_HZ);
 		return;
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index dbfe402..10c780a 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -126,7 +126,7 @@ uniarp_cache_svc(uip, ip, atm, atmsub, origin)
 	 * If there aren't any entries yet, create one
 	 */
 	if ((ipuap == NULL) && (nouap == NULL)) {
-		ipuap = uma_zalloc(uniarp_zone, M_WAITOK);
+		ipuap = uma_zalloc(uniarp_zone, 0);
 		if (ipuap == NULL)
 			return (ENOMEM);
 		ipuap->ua_dstip.s_addr = ip->s_addr;
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index ac1c167..cfc081c 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -133,7 +133,7 @@ uniarp_pvcopen(ivp)
 	/*
 	 * Get an arp map entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_ZERO);
 	if (uap == NULL)
 		return (MAP_FAILED);
 
@@ -279,7 +279,7 @@ uniarp_svcout(ivp, dst)
 	/*
 	 * We're a client with an open VCC to the server, get a new arp entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_WAITOK);
+	uap = uma_zalloc(uniarp_zone, 0);
 	if (uap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
@@ -440,7 +440,7 @@ uniarp_svcin(ivp, dst, dstsub)
 	/*
 	 * No info in the cache - get a new arp entry
 	 */
-	uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO);
+	uap = uma_zalloc(uniarp_zone, M_ZERO);
 	if (uap == NULL) {
 		(void) splx(s);
 		return (MAP_FAILED);
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 3635523..7bdb100 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -188,7 +188,7 @@ uniip_ipact(inp)
 	/*
 	 * Get a new interface control block
 	 */
-	uip = uma_zalloc(uniip_zone, M_WAITOK | M_ZERO);
+	uip = uma_zalloc(uniip_zone, M_ZERO);
 	if (uip == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index aa49fda..c15d02e 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$");
 #endif
 
 #define	ALLOC_IE(ie) do {						\
-	(ie) = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);		\
+	(ie) = uma_zalloc(unisig_ie_zone, M_ZERO);			\
 	if ((ie) == NULL)						\
 		return (ENOMEM);					\
 } while (0)
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index a002426..a193d00 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -294,7 +294,7 @@ unisig_send_setup(usp, uvp)
 	/*
 	 * Get memory for a SETUP message
 	 */
-	setup = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	setup = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (setup == NULL) {
 		err = ENOMEM;
 		goto done;
@@ -320,7 +320,7 @@ unisig_send_setup(usp, uvp)
 	 * specify one in the attribute block
 	 */
 	if (ap->calling.tag != T_ATM_PRESENT) {
-		setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, M_WAITOK); 
+		setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, 0);
 		if (setup->msg_ie_cgad == NULL) {
 			err = ENOMEM;
 			goto done;
@@ -379,11 +379,11 @@ unisig_send_release(usp, uvp, msg, cause)
 	/*
 	 * Get memory for a RELEASE message
 	 */
-	rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (rls_msg == NULL) {
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_msg);
 		return(ENOMEM);
@@ -455,11 +455,11 @@ unisig_send_release_complete(usp, uvp, msg, cause)
 	/*
 	 * Get memory for a RELEASE COMPLETE message
 	 */
-	rls_cmp = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	rls_cmp = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (rls_cmp == NULL) {
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_cmp);
 		return(ENOMEM);
@@ -534,16 +534,16 @@ unisig_send_status(usp, uvp, msg, cause)
 	/*
 	 * Get memory for a STATUS message
 	 */
-	stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	stat_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (stat_msg == NULL) {
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, stat_msg);
 		return(ENOMEM);
 	}
-	clst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); 
+	clst_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (clst_ie == NULL) {
 		uma_zfree(unisig_msg_zone, stat_msg);
 		uma_zfree(unisig_ie_zone, cause_ie);
@@ -679,7 +679,7 @@ unisig_rcv_restart(usp, msg)
 	/*
 	 * Get memory for a RESTART ACKNOWLEDGE message
 	 */
-	rsta_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	rsta_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (rsta_msg == NULL) {
 		return;
 	}
@@ -772,7 +772,7 @@ unisig_rcv_setup(usp, msg)
 	/*
 	 * Get a new VCCB for the connection
 	 */
-	uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO);
+	uvp = uma_zalloc(unisig_vc_zone, M_ZERO);
 	if (uvp == NULL) {
 		return;
 	}
@@ -842,7 +842,7 @@ unisig_rcv_msg(usp, m)
 	/*
 	 * Get storage for the message
 	 */
-	msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (msg == NULL) {
 		err = ENOMEM;
 		goto done;
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 31cd1a4..8a91fb6 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -275,7 +275,7 @@ unisig_open_vcc(usp, cvp)
 	/*
 	 * Allocate control block for VCC
 	 */
-	uvp = uma_zalloc(unisig_vc_zone, M_WAITOK | M_ZERO);
+	uvp = uma_zalloc(unisig_vc_zone, M_ZERO);
 	if (uvp == NULL) {
 		return(ENOMEM);
 	}
@@ -897,7 +897,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->aal.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_aalp) {
 			msg->msg_ie_aalp = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_aalp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -955,7 +955,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->traffic.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_clrt) {
 			msg->msg_ie_clrt = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_clrt == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1012,7 +1012,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->bearer.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_bbcp) {
 			msg->msg_ie_bbcp = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_bbcp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1040,7 +1040,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->bhli.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_bhli) {
 			msg->msg_ie_bhli = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_bhli == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1080,7 +1080,7 @@ unisig_set_attrs(usp, msg, ap)
 			ap->blli.tag_l3 == T_ATM_PRESENT) {
 		if (!msg->msg_ie_blli) {
 			msg->msg_ie_blli = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_blli == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1165,7 +1165,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->called.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_cdad) {
 			msg->msg_ie_cdad = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_cdad == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1181,7 +1181,7 @@ unisig_set_attrs(usp, msg, ap)
 		if (ap->called.subaddr.address_format != T_ATM_ABSENT) {
 			if (!msg->msg_ie_cdsa) {
 				msg->msg_ie_cdsa = uma_zalloc(unisig_ie_zone,
-				    M_WAITOK | M_ZERO);
+				    M_ZERO);
 				if (msg->msg_ie_cdsa == NULL) {
 					err = ENOMEM;
 					goto done;
@@ -1203,7 +1203,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->calling.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_cgad) {
 			msg->msg_ie_cgad = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_cgad == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1220,7 +1220,7 @@ unisig_set_attrs(usp, msg, ap)
 				T_ATM_ABSENT) {
 			if (!msg->msg_ie_cgsa) {
 				msg->msg_ie_cgsa = uma_zalloc(unisig_ie_zone,
-				    M_WAITOK | M_ZERO);
+				    M_ZERO);
 				if (msg->msg_ie_cgsa == NULL) {
 					err = ENOMEM;
 					goto done;
@@ -1241,7 +1241,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->qos.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_qosp) {
 			msg->msg_ie_qosp = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_qosp == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1273,7 +1273,7 @@ unisig_set_attrs(usp, msg, ap)
 				ap->transit.v.length != 0) {
 		if (!msg->msg_ie_trnt) {
 			msg->msg_ie_trnt = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_trnt == NULL) {
 				err = ENOMEM;
 				goto done;
@@ -1298,7 +1298,7 @@ unisig_set_attrs(usp, msg, ap)
 	if (ap->cause.tag == T_ATM_PRESENT) {
 		if (!msg->msg_ie_caus) {
 			msg->msg_ie_caus = uma_zalloc(unisig_ie_zone,
-			    M_WAITOK | M_ZERO);
+			    M_ZERO);
 			if (msg->msg_ie_caus == NULL) {
 				err = ENOMEM;
 				goto done;
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 3c88cba..6c5bc36 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -456,7 +456,7 @@ unisig_vc_act04(usp, uvp, msg)
 		vpi = msg->msg_ie_cnid->ie_cnid_vpci;
 		vci = msg->msg_ie_cnid->ie_cnid_vci;
 	} else {
-		iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
+		iep = uma_zalloc(unisig_ie_zone, 0);
 		if (iep == NULL)
 			return (ENOMEM);
 		iep->ie_ident = UNI_IE_CNID;
@@ -548,10 +548,10 @@ unisig_vc_act05(usp, uvp, msg)
 	/*
 	 * Send a RELEASE message
 	 */
-	rls_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (rls_msg == NULL)
 		return(ENOMEM);
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, rls_msg);
 		return(ENOMEM);
@@ -668,7 +668,7 @@ unisig_vc_act06(usp, uvp, msg)
 		 * No--VCI must have been specified earlier
 		 */
 		if (!uvp->uv_vci) {
-			iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
+			iep = uma_zalloc(unisig_ie_zone, 0);
 			if (iep == NULL)
 				return(ENOMEM);
 			iep->ie_ident = UNI_IE_CNID;
@@ -742,7 +742,7 @@ unisig_vc_act06(usp, uvp, msg)
 	/*
 	 * Get memory for a CONNECT ACK message
 	 */
-	cack_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	cack_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (cack_msg == NULL)
 		return(ENOMEM);
 
@@ -1058,7 +1058,7 @@ unisig_vc_act09(usp, uvp, msg)
 	int			rc;
 	struct unisig_msg	*conn_msg;
 
-	conn_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	conn_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (conn_msg == NULL)
 		return(ENOMEM);
 
@@ -1389,7 +1389,7 @@ unisig_vc_act15(usp, uvp, msg)
 			}
 		}
 		if (cause == UNI_IE_CAUS_MISSING) {
-			iep = uma_zalloc(unisig_ie_zone, M_WAITOK);
+			iep = uma_zalloc(unisig_ie_zone, 0);
 			if (iep == NULL)
 				return(ENOMEM);
 			iep->ie_ident = UNI_IE_CNID;
@@ -1611,7 +1611,7 @@ unisig_vc_act20(usp, uvp, msg)
 	/*
 	 * Get memory for a STATUS ENQUIRY message
 	 */
-	stat_msg = uma_zalloc(unisig_msg_zone, M_WAITOK);
+	stat_msg = uma_zalloc(unisig_msg_zone, 0);
 	if (stat_msg == NULL)
 		return(ENOMEM);
 
@@ -1757,15 +1757,15 @@ unisig_vc_act22(usp, uvp, msg)
 	/*
 	 * Get memory for a STATUS message
 	 */
-	status = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	status = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (status == NULL)
 		return(ENOMEM);
-	callst_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO);
+	callst_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (callst_ie == NULL) {
 		uma_zfree(unisig_msg_zone, status);
 		return(ENOMEM);
 	}
-	cause_ie = uma_zalloc(unisig_ie_zone, M_WAITOK | M_ZERO); 
+	cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO);
 	if (cause_ie == NULL) {
 		uma_zfree(unisig_msg_zone, status);
 		uma_zfree(unisig_ie_zone, callst_ie);
@@ -1859,7 +1859,7 @@ unisig_vc_act23(usp, uvp, msg)
 	/*
 	 * Get memory for the ADD PARTY REJECT message
 	 */
-	apr_msg = uma_zalloc(unisig_msg_zone, M_WAITOK | M_ZERO);
+	apr_msg = uma_zalloc(unisig_msg_zone, M_ZERO);
 	if (apr_msg == NULL)
 		return(ENOMEM);