diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/fb/vga.c | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/dev/fb/vga.c')
| -rw-r--r-- | sys/dev/fb/vga.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |
