Back out M_* changes, per decision of the TRB.

Approved by: trb

5 files changed, 19 insertions, 19 deletions

diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index 7fb5a10..e0c83f9 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, 0);
+	sap = uma_zalloc(spansarp_zone, M_WAITOK);
 	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, 0);
+		sap = uma_zalloc(spansarp_zone, M_WAITOK);
 		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, 0);
+			sap = uma_zalloc(spansarp_zone, M_WAITOK);
 			if (sap == NULL) {
 				err = ENOMEM;
 				break;
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index a719678..5b93892 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, 0);
+	clp = uma_zalloc(spanscls_zone, M_WAITOK);
 	if (clp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 89185bd..c597080 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, 0);
+	req = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	req = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	rsp_msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	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, 0);
+	msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 	if (msg == NULL)
 		return;
 
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 8f96374..7562820 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, 0);
+		msg = uma_zalloc(spans_msg_zone, M_WAITOK);
 		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 24edec2..93ea6d4 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, 0);
+	svp = uma_zalloc(spans_vc_zone, M_WAITOK);
 	if (svp == NULL) {
 		return(ENOMEM);
 	}