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

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

2 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index 0dbb73b..edfc64e 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -86,12 +86,12 @@ vid_realloc_array(void)
 
 	s = spltty();
 	newsize = ((adapters + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA;
-	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_WAITOK | M_ZERO);
+	new_adp = malloc(sizeof(*new_adp)*newsize, M_DEVBUF, M_ZERO);
 	new_vidsw = malloc(sizeof(*new_vidsw)*newsize, M_DEVBUF,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 #ifdef FB_INSTALL_CDEV
 	new_cdevsw = malloc(sizeof(*new_cdevsw)*newsize, M_DEVBUF,
-	    M_WAITOK | M_ZERO);
+	    M_ZERO);
 #endif
 	bcopy(adapter, new_adp, sizeof(*adapter)*adapters);
 	bcopy(vidsw, new_vidsw, sizeof(*vidsw)*adapters);
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 56e015b..0f3cda1 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -2848,7 +2848,7 @@ get_palette(video_adapter_t *adp, int base, int count,
     if ((base < 0) || (base >= 256) || (base + count > 256))
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    r = malloc(count*3, M_DEVBUF, 0);
     g = r + count;
     b = g + count;
     if (vga_save_palette2(adp, base, count, r, g, b)) {
@@ -2879,7 +2879,7 @@ set_palette(video_adapter_t *adp, int base, int count,
     if ((base < 0) || (base >= 256) || (base + count > 256))
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    r = malloc(count*3, M_DEVBUF, 0);
     g = r + count;
     b = g + count;
     copyin(red, r, count);