aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/fb/vga.c
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2003-02-19 05:47:46 +0000
committerWarner Losh <imp@FreeBSD.org>2003-02-19 05:47:46 +0000
commita163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch)
tree9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/dev/fb/vga.c
parent8f3e32c2b6b9f392e096f096653596f55f2134ae (diff)
downloadsrc-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.tar.gz
src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.zip
Back out M_* changes, per decision of the TRB.
Approved by: trb
Notes
Notes: svn path=/head/; revision=111119
Diffstat (limited to 'sys/dev/fb/vga.c')
-rw-r--r--sys/dev/fb/vga.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 0f3cda117dda..56e015ba1399 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, 0);
+ r = malloc(count*3, M_DEVBUF, M_WAITOK);
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, 0);
+ r = malloc(count*3, M_DEVBUF, M_WAITOK);
g = r + count;
b = g + count;
copyin(red, r, count);