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

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 2d0ea3f..05d5e5e 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.c
@@ -103,7 +103,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 			    (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2,
 				M_DEVBUF, 
-				((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO);
+				((wait) ? 0 : M_NOWAIT) | M_ZERO);
 			if (vtb->vtb_buffer != 0) {
 				vtb->vtb_flags |= VTB_ALLOCED;
 			}
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 2d0ea3f..05d5e5e 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.c
@@ -103,7 +103,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 			vtb->vtb_buffer =
 			    (vm_offset_t)malloc(cols*rows*sizeof(u_int16_t)*2,
 				M_DEVBUF, 
-				((wait) ? M_WAITOK : M_NOWAIT) | M_ZERO);
+				((wait) ? 0 : M_NOWAIT) | M_ZERO);
 			if (vtb->vtb_buffer != 0) {
 				vtb->vtb_flags |= VTB_ALLOCED;
 			}
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 3e3f437..db60e82 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -503,7 +503,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, M_WAITOK);
+	spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
 	spkr_active = TRUE;
 	return(0);
     }
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 55ce644..847ec74 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -315,7 +315,7 @@ sc_attach_unit(int unit, int flags)
 	    /* assert(sc_console->ts != NULL); */
 	    kernel_console_ts = sc_console->ts;
 	    sc_console->ts = malloc(sc_console->tsw->te_size,
-				    M_DEVBUF, M_WAITOK);
+				    M_DEVBUF, 0);
 	    bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
     	    (*sc_console->tsw->te_default_attr)(sc_console,
 						user_default.std_color,
@@ -2696,9 +2696,9 @@ scinit(int unit, int flags)
 	    sc->font_16 = font_16;
 	} else if (sc->font_8 == NULL) {
 	    /* assert(sc_malloc) */
-	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, M_WAITOK);
-	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, M_WAITOK);
-	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, M_WAITOK);
+	    sc->font_8 = malloc(sizeof(font_8), M_DEVBUF, 0);
+	    sc->font_14 = malloc(sizeof(font_14), M_DEVBUF, 0);
+	    sc->font_16 = malloc(sizeof(font_16), M_DEVBUF, 0);
 	}
 #endif
 
@@ -2725,7 +2725,7 @@ scinit(int unit, int flags)
 					 kernel_default.rev_color);
 	} else {
 	    /* assert(sc_malloc) */
-	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO);
+	    sc->dev = malloc(sizeof(dev_t)*sc->vtys, M_DEVBUF, M_ZERO);
 	    sc->dev[0] = makedev(CDEV_MAJOR, unit*MAXCONS);
 	    sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty);
 	    scp = alloc_scp(sc, sc->first_vty);
@@ -2945,7 +2945,7 @@ static scr_stat
 
     /* assert(sc_malloc) */
 
-    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, M_WAITOK);
+    scp = (scr_stat *)malloc(sizeof(scr_stat), M_DEVBUF, 0);
     init_scp(sc, vty, scp);
 
     sc_alloc_scr_buffer(scp, TRUE, TRUE);