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

Approved by: trb

13 files changed, 23 insertions, 23 deletions

diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 6b5a2ca..e70c40e 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -234,7 +234,7 @@ ctxopen(dev_t dev, int flags, int fmt, struct thread *td)
 
 	/* get space for the LUT buffer */
 
-	sr->lutp = malloc(LUTSIZE, M_DEVBUF, 0);
+	sr->lutp = malloc(LUTSIZE, M_DEVBUF, M_WAITOK);
 	if (sr->lutp == NULL)
 		return (ENOMEM);
 
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 4b7b3cb..0a5a0e0 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -184,7 +184,7 @@ gpopen(dev, flags, fmt, td)
 		return (EBUSY);
 
 	/* Have memory for buffer? */
-	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0);
+	sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK);
 	if (sc->sc_inbuf == 0)
 		return (ENOMEM);
 
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index a96d5fa..b64f978 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -136,11 +136,11 @@ static struct mbuf *makembuf (void *buf, unsigned len)
 {
 	struct mbuf *m, *o, *p;
 
-	MGETHDR (m, M_NOWAIT, MT_DATA);
+	MGETHDR (m, M_DONTWAIT, MT_DATA);
 	if (! m)
 		return (0);
 	if (len >= MINCLSIZE)
-		MCLGET (m, M_NOWAIT);
+		MCLGET (m, M_DONTWAIT);
 	m->m_pkthdr.len = len;
 	m->m_len = 0;
 
@@ -153,13 +153,13 @@ static struct mbuf *makembuf (void *buf, unsigned len)
 		if (! n) {
 			/* Allocate new mbuf. */
 			o = p;
-			MGET (p, M_NOWAIT, MT_DATA);
+			MGET (p, M_DONTWAIT, MT_DATA);
 			if (! p) {
 				m_freem (m);
 				return (0);
 			}
 			if (len >= MINCLSIZE)
-				MCLGET (p, M_NOWAIT);
+				MCLGET (p, M_DONTWAIT);
 			p->m_len = 0;
 			o->m_next = p;
 
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 60abe60..dd62365 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -671,7 +671,7 @@ elget(buf, totlen, ifp)
         cp = buf;
         epkt = cp + totlen;
 
-        MGETHDR(m, M_NOWAIT, MT_DATA);
+        MGETHDR(m, M_DONTWAIT, MT_DATA);
         if (m == 0)
                 return (0);
         m->m_pkthdr.rcvif = ifp;
@@ -681,7 +681,7 @@ elget(buf, totlen, ifp)
         mp = ⊤
         while (totlen > 0) {
                 if (top) {
-                        MGET(m, M_NOWAIT, MT_DATA);
+                        MGET(m, M_DONTWAIT, MT_DATA);
                         if (m == 0) {
                                 m_freem(top);
                                 return (0);
@@ -690,7 +690,7 @@ elget(buf, totlen, ifp)
                 }
                 len = min(totlen, epkt - cp);
                 if (len >= MINCLSIZE) {
-                        MCLGET(m, M_NOWAIT);
+                        MCLGET(m, M_DONTWAIT);
                         if (m->m_flags & M_EXT)
                                 m->m_len = len = min(len, MCLBYTES);
                         else
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index d3dd2f1..3ed6a96 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -386,7 +386,7 @@ le_input(
     struct ifnet *ifp = &sc->le_if;
     struct mbuf *m;
 
-    MGETHDR(m, M_NOWAIT, MT_DATA);
+    MGETHDR(m, M_DONTWAIT, MT_DATA);
     if (m == NULL) {
 	ifp->if_ierrors++;
 	return;
@@ -394,14 +394,14 @@ le_input(
     m->m_pkthdr.len = total_len;
     m->m_pkthdr.rcvif = ifp;
     if (total_len + LE_XTRA > MHLEN /* >= MINCLSIZE */) {
-	MCLGET(m, M_NOWAIT);
+	MCLGET(m, M_DONTWAIT);
 	if ((m->m_flags & M_EXT) == 0) {
 	    m_free(m);
 	    ifp->if_ierrors++;
 	    return;
 	}
     } else if (total_len + LE_XTRA > MHLEN && MINCLSIZE == (MHLEN+MLEN)) {
-	MGET(m->m_next, M_NOWAIT, MT_DATA);
+	MGET(m->m_next, M_DONTWAIT, MT_DATA);
 	if (m->m_next == NULL) {
 	    m_free(m);
 	    ifp->if_ierrors++;
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 84cd174..574d3e7 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -1095,7 +1095,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	size_t s;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_NOWAIT, MT_DATA);
+	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -1109,7 +1109,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	 */
 	if ((len + ETHER_ALIGN) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_NOWAIT);
+		MCLGET(m, M_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 9e32538..59c4b6e 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -402,7 +402,7 @@ loranwrite(dev_t dev, struct uio * uio, int ioflag)
 
 	idx = minor(dev);
 
-	MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, 0);
+	MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, M_WAITOK);
 	c = imin(uio->uio_resid, (int)sizeof *this);
 	err = uiomove((caddr_t)this, c, uio);        
 	if (err) {
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index d3362e3..d104196 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -330,7 +330,7 @@ void ovlinit(int force)
 	{
 		if(ovlinitflag == 0 &&
 		   (ovltbl = (Ovl_tbl *)malloc(sizeof(Ovl_tbl) * OVLTBL_SIZE,
-					       M_DEVBUF, 0)) == NULL)
+					       M_DEVBUF, M_WAITOK)) == NULL)
 			panic("pcvt_kbd: malloc of Ovl_tbl failed");
 
 		for(i=0; i<OVLTBL_SIZE; i++)
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index d908c7b..8c77933 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -1305,7 +1305,7 @@ vt_coldmalloc(void)
 	for(nscr = 0; nscr < PCVT_NSCREENS; nscr++)
 	{
 		if((vs[nscr].Memory = (u_short *)malloc(screen_max_size * 2,
-			 M_DEVBUF, 0)) == NULL)
+			 M_DEVBUF, M_WAITOK)) == NULL)
 		{
 			printf("pcvt: screen memory malloc failed, "
 			       "NSCREEN=%d, nscr=%d\n",
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 5f08f40..4df2971 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -1409,7 +1409,7 @@ loadchar(int fontset, int character, int char_scanlines, u_char *char_table)
 
 	if(saved_charsets[fontset] == 0)
 		saved_charsets[fontset] =
-			(u_char *)malloc(32 * 256, M_DEVBUF, 0);
+			(u_char *)malloc(32 * 256, M_DEVBUF, M_WAITOK);
 
 	if((bak = saved_charsets[fontset]))
 	{
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index e6487c1..de4c5ca 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -495,7 +495,7 @@ spkropen(dev, flags, fmt, td)
 	(void) printf("spkropen: about to perform play initialization\n");
 #endif /* DEBUG */
 	playinit();
-	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index c368e4d..5284cec 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -694,7 +694,7 @@ vesa_bios_init(void)
 		if (modes >= vesa_vmode_max) {
 			vesa_vmode_max += MODE_TABLE_DELTA;
 			p = malloc(sizeof(*vesa_vmode)*(vesa_vmode_max + 1),
-				   M_DEVBUF, 0);
+				   M_DEVBUF, M_WAITOK);
 #if VESA_DEBUG > 1
 			printf("vesa_bios_init(): modes:%d, vesa_mode_max:%d\n",
 			       modes, vesa_vmode_max);
@@ -1341,7 +1341,7 @@ get_palette(video_adapter_t *adp, int base, int count,
 	if (bits <= 6)
 		return 1;
 
-	r = malloc(count*3, M_DEVBUF, 0);
+	r = malloc(count*3, M_DEVBUF, M_WAITOK);
 	g = r + count;
 	b = g + count;
 	error = vesa_bios_save_palette2(base, count, r, g, b, bits);
@@ -1378,7 +1378,7 @@ set_palette(video_adapter_t *adp, int base, int count,
 		|| ((bits = vesa_bios_set_dac(8)) <= 6))
 		return 1;
 
-	r = malloc(count*3, M_DEVBUF, 0);
+	r = malloc(count*3, M_DEVBUF, M_WAITOK);
 	g = r + count;
 	b = g + count;
 	copyin(red, r, count);
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 37627d2..ab5d4c3 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -343,7 +343,7 @@ wtopen (dev_t dev, int flag, int fmt, struct thread *td)
 		return (ENXIO);
 
 	t->bsize = (minor (dev) & WT_BSIZE) ? 1024 : 512;
-	t->buf = malloc (t->bsize, M_TEMP, 0);
+	t->buf = malloc (t->bsize, M_TEMP, M_WAITOK);
 	if (! t->buf)
 		return (EAGAIN);