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/drm | |
| 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/drm')
| -rw-r--r-- | sys/dev/drm/drm_drv.h | 2 | ||||
| -rw-r--r-- | sys/dev/drm/drm_memory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h index 729b2f9..1425859 100644 --- a/sys/dev/drm/drm_drv.h +++ b/sys/dev/drm/drm_drv.h @@ -1451,7 +1451,7 @@ DRM(linux_ioctl)(DRM_OS_STRUCTPROC *p, struct linux_ioctl_args* args) if ( size > STK_PARAMS ) { if ( size > IOCPARM_MAX ) return EINVAL; - memp = malloc( (u_long)size, DRM(M_DRM), M_WAITOK ); + memp = malloc( (u_long)size, DRM(M_DRM), 0 ); data = memp; } else { data = ubuf.stkbuf; diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h index 81fa561..c6f319c 100644 --- a/sys/dev/drm/drm_memory.h +++ b/sys/dev/drm/drm_memory.h @@ -288,7 +288,7 @@ unsigned long DRM(alloc_pages)(int order, int area) address = __get_free_pages(GFP_KERNEL, order); #endif /* __linux__ */ #ifdef __FreeBSD__ - address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), M_WAITOK, 0, ~0, 1, 0); + address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), 0, 0, ~0, 1, 0); #endif /* __FreeBSD__ */ if (!address) { DRM_OS_SPINLOCK(&DRM(mem_lock)); |
