32c32
< __FBSDID("$FreeBSD: head/sys/dev/drm/drm_bufs.c 183603 2008-10-04 14:45:34Z rnoland $");
---
> __FBSDID("$FreeBSD: head/sys/dev/drm/drm_bufs.c 183833 2008-10-13 18:03:27Z rnoland $");
141c141
< map = malloc(sizeof(*map), M_DRM, M_ZERO | M_NOWAIT);
---
> map = malloc(sizeof(*map), DRM_MEM_MAPS, M_ZERO | M_NOWAIT);
163c163
< map->handle = malloc(map->size, M_DRM, M_NOWAIT);
---
> map->handle = malloc(map->size, DRM_MEM_MAPS, M_NOWAIT);
167c167
< free(map, M_DRM);
---
> free(map, DRM_MEM_MAPS);
177,178c177,178
< free(map->handle, M_DRM);
< free(map, M_DRM);
---
> free(map->handle, DRM_MEM_MAPS);
> free(map, DRM_MEM_MAPS);
208c208
< free(map, M_DRM);
---
> free(map, DRM_MEM_MAPS);
215c215
< free(map, M_DRM);
---
> free(map, DRM_MEM_MAPS);
233c233
< free(map, M_DRM);
---
> free(map, DRM_MEM_MAPS);
242c242
< free(map, M_DRM);
---
> free(map, DRM_MEM_MAPS);
316c316
< free(map->handle, M_DRM);
---
> free(map->handle, DRM_MEM_MAPS);
334c334
< free(map, M_DRM);
---
> free(map, DRM_MEM_MAPS);
377c377
< free(entry->seglist, M_DRM);
---
> free(entry->seglist, DRM_MEM_SEGS);
384c384
< free(entry->buflist[i].dev_private, M_DRM);
---
> free(entry->buflist[i].dev_private, DRM_MEM_BUFS);
386c386
< free(entry->buflist, M_DRM);
---
> free(entry->buflist, DRM_MEM_BUFS);
453c453
< entry->buflist = malloc(count * sizeof(*entry->buflist), M_DRM,
---
> entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS,
479c479
< buf->dev_private = malloc(buf->dev_priv_size, M_DRM,
---
> buf->dev_private = malloc(buf->dev_priv_size, DRM_MEM_BUFS,
496,497c496,497
< (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), M_DRM,
< M_NOWAIT);
---
> (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist),
> DRM_MEM_BUFS, M_NOWAIT);
555c555
< entry->buflist = malloc(count * sizeof(*entry->buflist), M_DRM,
---
> entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS,
557c557
< entry->seglist = malloc(count * sizeof(*entry->seglist), M_DRM,
---
> entry->seglist = malloc(count * sizeof(*entry->seglist), DRM_MEM_SEGS,
564c564
< sizeof(*dma->pagelist), M_DRM, M_NOWAIT);
---
> sizeof(*dma->pagelist), DRM_MEM_PAGES, M_NOWAIT);
568,570c568,570
< free(temp_pagelist, M_DRM);
< free(entry->seglist, M_DRM);
< free(entry->buflist, M_DRM);
---
> free(temp_pagelist, DRM_MEM_PAGES);
> free(entry->seglist, DRM_MEM_SEGS);
> free(entry->buflist, DRM_MEM_BUFS);
595c595
< free(temp_pagelist, M_DRM);
---
> free(temp_pagelist, DRM_MEM_PAGES);
623,624c623,624
< buf->dev_private = malloc(buf->dev_priv_size, M_DRM,
< M_NOWAIT | M_ZERO);
---
> buf->dev_private = malloc(buf->dev_priv_size,
> DRM_MEM_BUFS, M_NOWAIT | M_ZERO);
630c630
< free(temp_pagelist, M_DRM);
---
> free(temp_pagelist, DRM_MEM_PAGES);
641,642c641,642
< (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), M_DRM,
< M_NOWAIT);
---
> (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist),
> DRM_MEM_BUFS, M_NOWAIT);
646c646
< free(temp_pagelist, M_DRM);
---
> free(temp_pagelist, DRM_MEM_PAGES);
658c658
< free(dma->pagelist, M_DRM);
---
> free(dma->pagelist, DRM_MEM_PAGES);
712c712
< entry->buflist = malloc(count * sizeof(*entry->buflist), M_DRM,
---
> entry->buflist = malloc(count * sizeof(*entry->buflist), DRM_MEM_BUFS,
737c737
< buf->dev_private = malloc(buf->dev_priv_size, M_DRM,
---
> buf->dev_private = malloc(buf->dev_priv_size, DRM_MEM_BUFS,
757,758c757,758
< (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist), M_DRM,
< M_NOWAIT);
---
> (dma->buf_count + entry->buf_count) * sizeof(*dma->buflist),
> DRM_MEM_BUFS, M_NOWAIT);