diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/dev/drm | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
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 1425859..729b2f9 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), 0 ); + memp = malloc( (u_long)size, DRM(M_DRM), M_WAITOK ); data = memp; } else { data = ubuf.stkbuf; diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h index c6f319c..81fa561 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), 0, 0, ~0, 1, 0); + address = (vm_offset_t) contigmalloc(bytes, DRM(M_DRM), M_WAITOK, 0, ~0, 1, 0); #endif /* __FreeBSD__ */ if (!address) { DRM_OS_SPINLOCK(&DRM(mem_lock)); |
