From a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 19 Feb 2003 05:47:46 +0000 Subject: Back out M_* changes, per decision of the TRB. Approved by: trb --- sys/dev/drm/drm_drv.h | 2 +- sys/dev/drm/drm_memory.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/drm') diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h index 1425859b7cc3..729b2f960c04 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 c6f319c84ba8..81fa561a4186 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)); -- cgit v1.3