[src/trunk]: src/sys/external/bsd/drm/dist/bsd-core remove incomplete convers...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e8e422bf2b8d
branches:  trunk
changeset: 773234:e8e422bf2b8d
user:      drochner <drochner%NetBSD.org@localhost>
date:      Sun Jan 29 11:49:02 2012 +0000

description:
remove incomplete conversion to kmem_alloc -- inconsistent use
leads at least to diagnostic panics

diffstat:

 sys/external/bsd/drm/dist/bsd-core/drm_bufs.c |  16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diffs (50 lines):

diff -r 7718093de97f -r e8e422bf2b8d sys/external/bsd/drm/dist/bsd-core/drm_bufs.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c     Sun Jan 29 11:45:37 2012 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c     Sun Jan 29 11:49:02 2012 +0000
@@ -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 @@
                        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 @@
                        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 @@
                }
                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: