Module Name: src
Committed By: drochner
Date: Sun Jan 29 11:49:02 UTC 2012
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_bufs.c
Log Message:
remove incomplete conversion to kmem_alloc -- inconsistent use
leads at least to diagnostic panics
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.9 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.10
--- src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.9 Fri Jan 27 19:48:40 2012
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c Sun Jan 29 11:49:02 2012
@@ -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,
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,
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, d
}
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:
