Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove incomplete conversion to kmem_alloc -- inconsistent use 

leads at least to diagnostic panics
This commit is contained in:
drochner 2012-01-29 11:49:02 +00:00
parent 67baa3b64c
commit 38123a2b84
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/external/bsd/drm/dist/bsd-core/drm_bufs.c vendored
View File

@ -36,10 +36,6 @@
#include "dev/pci/pcireg.h"
#endif
#if defined(__NetBSD__)
#include <sys/kmem.h>
#endif
#include "drmP.h"
/* Allocation of PCI memory resources (framebuffer, registers, etc.) for
@ -188,11 +184,7 @@ int drm_addmap(struct drm_device * dev, unsigned long offset,
map->mtrr = 1;
break;
case _DRM_SHM:
#if defined(__NetBSD__)
map->handle = kmem_alloc(map->size, KM_NOSLEEP);
#else
map->handle = malloc(map->size, DRM_MEM_MAPS, M_NOWAIT);
#endif
DRM_DEBUG("%lu %d %p\n",
map->size, drm_order(map->size), map->handle);
if (!map->handle) {
@ -206,11 +198,7 @@ int drm_addmap(struct drm_device * dev, unsigned long offset,
DRM_LOCK();
if (dev->lock.hw_lock != NULL) {
DRM_UNLOCK();
#if defined(__NetBSD__)
kmem_free(map->handle, map->size);
#else
free(map->handle, DRM_MEM_MAPS);
#endif
free(map, DRM_MEM_MAPS);
return EBUSY;
}
@ -350,11 +338,7 @@ void drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
}
break;
case _DRM_SHM:
#if defined(__NetBSD__)
kmem_free(map->handle, map->size);
#else
free(map->handle, DRM_MEM_MAPS);
#endif
break;
case _DRM_AGP:
case _DRM_SCATTER_GATHER: