diff options
| author | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | 44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/fb | |
| parent | 1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff) | |
Notes
Diffstat (limited to 'sys/dev/fb')
| -rw-r--r-- | sys/dev/fb/fb.c | 6 | ||||
| -rw-r--r-- | sys/dev/fb/vga.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 0dbb73bac830..edfc64eef5b1 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 56e015ba1399..0f3cda117dda 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); |