Replace M_DONTWAIT with M_NOWAIT for malloc().

Pointed out by: nate@root.org

4 files changed, 23 insertions, 23 deletions

diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 2e925f6..bf40104 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -749,10 +749,10 @@ void fw_init(struct firewire_comm *fc)
 /* Initialize csr registers */
 	fc->topology_map = (struct fw_topology_map *)malloc(
 				sizeof(struct fw_topology_map),
-				M_DEVBUF, M_DONTWAIT | M_ZERO);
+				M_DEVBUF, M_NOWAIT | M_ZERO);
 	fc->speed_map = (struct fw_speed_map *)malloc(
 				sizeof(struct fw_speed_map),
-				M_DEVBUF, M_DONTWAIT | M_ZERO);
+				M_DEVBUF, M_NOWAIT | M_ZERO);
 	CSRARC(fc, TOPO_MAP) = 0x3f1 << 16;
 	CSRARC(fc, TOPO_MAP + 4) = 1;
 	CSRARC(fc, SPED_MAP) = 0x3f1 << 16;
@@ -765,7 +765,7 @@ void fw_init(struct firewire_comm *fc)
 	SLIST_INIT(&fc->ongocsr);
 	SLIST_INIT(&fc->csrfree);
 	for( i = 0 ; i < FWMAXCSRDIR ; i++){
-		csrd = (struct csrdir *) malloc(sizeof(struct csrdir), M_DEVBUF,M_DONTWAIT);
+		csrd = (struct csrdir *) malloc(sizeof(struct csrdir), M_DEVBUF,M_NOWAIT);
 		if(csrd == NULL) break;
 		SLIST_INSERT_HEAD(&fc->csrfree, csrd, link);
 	}
@@ -796,7 +796,7 @@ void fw_init(struct firewire_comm *fc)
 	xfer = fw_xfer_alloc();
 	if(xfer == NULL) return;
 
-	fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_DEVBUF, M_DONTWAIT);
+	fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_DEVBUF, M_NOWAIT);
 	if(fwb == NULL){
 		fw_xfer_free(xfer);
 	}
@@ -950,7 +950,7 @@ fw_xfer_alloc()
 {
 	struct fw_xfer *xfer;
 
-	xfer = malloc(sizeof(struct fw_xfer), M_DEVBUF, M_DONTWAIT | M_ZERO);
+	xfer = malloc(sizeof(struct fw_xfer), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (xfer == NULL)
 		return xfer;
 
@@ -1058,7 +1058,7 @@ fw_phy_config(struct firewire_comm *fc, int root_node, int gap_count)
 	xfer->act.hand = fw_phy_config_callback;
 
 	xfer->send.buf = malloc(sizeof(u_int32_t),
-					M_DEVBUF, M_DONTWAIT | M_ZERO);
+					M_DEVBUF, M_NOWAIT | M_ZERO);
 	fp = (struct fw_pkt *)xfer->send.buf;
 	fp->mode.ld[1] = 0;
 	if (root_node >= 0)
@@ -1316,7 +1316,7 @@ loop:
 			fc->ongoeui.hi = 0xffffffff; fc->ongoeui.lo = 0xffffffff;
 			goto loop;
 		}
-		fwdev = malloc(sizeof(struct fw_device), M_DEVBUF, M_DONTWAIT);
+		fwdev = malloc(sizeof(struct fw_device), M_DEVBUF, M_NOWAIT);
 		if(fwdev == NULL)
 			return;
 		fwdev->fc = fc;
@@ -1366,7 +1366,7 @@ loop:
 	}
 	xfer->send.len = 16;
 	xfer->spd = 0;
-	xfer->send.buf = malloc(16, M_DEVBUF, M_DONTWAIT);
+	xfer->send.buf = malloc(16, M_DEVBUF, M_NOWAIT);
 	if(xfer->send.buf == NULL){
 		fw_xfer_free( xfer);
 		return;
@@ -1417,7 +1417,7 @@ asyreqq(struct firewire_comm *fc, u_int8_t spd, u_int8_t tl, u_int8_t rt,
 	}
 	xfer->send.len = 16;
 	xfer->spd = spd; /* XXX:min(spd, fc->spd) */
-	xfer->send.buf = malloc(16, M_DEVBUF, M_DONTWAIT);
+	xfer->send.buf = malloc(16, M_DEVBUF, M_NOWAIT);
 	if(xfer->send.buf == NULL){
 		fw_xfer_free( xfer);
 		return NULL;
@@ -1747,7 +1747,7 @@ fw_get_tlabel(struct firewire_comm *fc, struct fw_xfer *xfer)
 			if(tmptl->xfer->dst == xfer->dst) break;
 		}
 		if(tmptl == NULL) {
-			tl = malloc(sizeof(struct tlabel),M_DEVBUF,M_DONTWAIT);
+			tl = malloc(sizeof(struct tlabel),M_DEVBUF,M_NOWAIT);
 			if (tl == NULL) {
 				splx(s);
 				return (-1);
@@ -1862,7 +1862,7 @@ fw_rcv(struct firewire_comm* fc, caddr_t buf, u_int len, u_int sub, u_int off, u
 				return;
 			}
 			xfer->spd = spd;
-			xfer->send.buf = malloc(16, M_DEVBUF, M_DONTWAIT);
+			xfer->send.buf = malloc(16, M_DEVBUF, M_NOWAIT);
 			resfp = (struct fw_pkt *)xfer->send.buf;
 			switch(fp->mode.common.tcode){
 			case FWTCODE_WREQQ:
@@ -2053,7 +2053,7 @@ fw_try_bmr(void *arg)
 	}
 	xfer->send.len = 24;
 	xfer->spd = 0;
-	xfer->send.buf = malloc(24, M_DEVBUF, M_DONTWAIT);
+	xfer->send.buf = malloc(24, M_DEVBUF, M_NOWAIT);
 	if(xfer->send.buf == NULL){
 		fw_xfer_free( xfer);
 		return;
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index 7e896f6..6c61bd9 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -593,13 +593,13 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 		sc->fc->it[sub]->flag |= FWXFERQ_DV;
 		/* XXX check malloc failure */
 		sc->fc->it[sub]->dvbuf
-			= (struct fw_dvbuf *)malloc(sizeof(struct fw_dvbuf) * NDVCHUNK, M_DEVBUF, M_DONTWAIT);
+			= (struct fw_dvbuf *)malloc(sizeof(struct fw_dvbuf) * NDVCHUNK, M_DEVBUF, M_NOWAIT);
 		STAILQ_INIT(&sc->fc->it[sub]->dvvalid);
 		STAILQ_INIT(&sc->fc->it[sub]->dvfree);
 		for( i = 0 ; i < NDVCHUNK ; i++){
 			/* XXX check malloc failure */
 			sc->fc->it[sub]->dvbuf[i].buf
-				= malloc(FWDVPMAX * sc->fc->it[sub]->dvpacket, M_DEVBUF, M_DONTWAIT);
+				= malloc(FWDVPMAX * sc->fc->it[sub]->dvpacket, M_DEVBUF, M_NOWAIT);
 			STAILQ_INSERT_TAIL(&sc->fc->it[sub]->dvfree,
 					&sc->fc->it[sub]->dvbuf[i], link);
 		}
@@ -625,12 +625,12 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 			return(EINVAL);
 		}
 		ir->bulkxfer
-			= (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->rx.nchunk, M_DEVBUF, M_DONTWAIT);
+			= (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->rx.nchunk, M_DEVBUF, M_NOWAIT);
 		if(ir->bulkxfer == NULL){
 			return(ENOMEM);
 		}
 		it->bulkxfer
-			= (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->tx.nchunk, M_DEVBUF, M_DONTWAIT);
+			= (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->tx.nchunk, M_DEVBUF, M_NOWAIT);
 		if(it->bulkxfer == NULL){
 			return(ENOMEM);
 		}
@@ -639,7 +639,7 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 			/* XXX psize must be 2^n and less or
 						equal to PAGE_SIZE */
 			* ((ibufreq->rx.psize + 3) &~3),
-			M_DEVBUF, M_DONTWAIT);
+			M_DEVBUF, M_NOWAIT);
 		if(ir->buf == NULL){
 			free(ir->bulkxfer, M_DEVBUF);
 			free(it->bulkxfer, M_DEVBUF);
@@ -653,7 +653,7 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td)
 			/* XXX psize must be 2^n and less or
 						equal to PAGE_SIZE */
 			* ((ibufreq->tx.psize + 3) &~3),
-			M_DEVBUF, M_DONTWAIT);
+			M_DEVBUF, M_NOWAIT);
 		if(it->buf == NULL){
 			free(ir->bulkxfer, M_DEVBUF);
 			free(it->bulkxfer, M_DEVBUF);
@@ -808,7 +808,7 @@ error:
 			err = EINVAL;
 			break;
 		}
-		fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_DEVBUF, M_DONTWAIT);
+		fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_DEVBUF, M_NOWAIT);
 		if(fwb == NULL){
 			err = ENOMEM;
 			break;
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 8a91272..b07cf08 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -1141,7 +1141,7 @@ fwohci_db_init(struct fwohci_dbch *dbch)
 	STAILQ_INIT(&dbch->db_trq);
 	db_tr = (struct fwohcidb_tr *)
 		malloc(sizeof(struct fwohcidb_tr) * dbch->ndb,
-		M_DEVBUF, M_DONTWAIT | M_ZERO);
+		M_DEVBUF, M_NOWAIT | M_ZERO);
 	if(db_tr == NULL){
 		printf("fwohci_db_init: malloc(1) failed\n");
 		return;
@@ -1159,7 +1159,7 @@ fwohci_db_init(struct fwohci_dbch *dbch)
 	}
 	for (i = 0; i < dbch->npages; i++) {
 		dbch->pages[i] = malloc(PAGE_SIZE, M_DEVBUF,
-						M_DONTWAIT | M_ZERO);
+						M_NOWAIT | M_ZERO);
 		if (dbch->pages[i] == NULL) {
 			printf("fwohci_db_init: malloc(2) failed\n");
 			for (j = 0; j < i; j ++)
@@ -1552,7 +1552,7 @@ fwohci_irxbuf_enable(struct firewire_comm *fc, int dmach)
 				sc->ir[dmach].xferq.bnchunk;
 		sc->ir[dmach].dummy =
 			malloc(sizeof(u_int32_t) * sc->ir[dmach].ndb, 
-			   M_DEVBUF, M_DONTWAIT);
+			   M_DEVBUF, M_NOWAIT);
 		if(sc->ir[dmach].dummy == NULL){
 			err = ENOMEM;
 			return err;
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 41aeaab..a8ed494 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -1597,7 +1597,7 @@ END_DEBUG
 
 	sbp->ocb = (struct sbp_ocb *) contigmalloc(
 		sizeof (struct sbp_ocb) * SBP_NUM_OCB,
-		M_SBP, M_DONTWAIT, 0x10000, 0xffffffff, PAGE_SIZE, 0ul);
+		M_SBP, M_NOWAIT, 0x10000, 0xffffffff, PAGE_SIZE, 0ul);
 	bzero(sbp->ocb, sizeof (struct sbp_ocb) * SBP_NUM_OCB);
 
 	if (sbp->ocb == NULL) {