Re: drm_bufs.c not compiling on i386-current

[Takahiro Kambe <taca%back-street.net@localhost>]

Here is no warranty patch.

-- 
Takahiro Kambe <taca%back-street.net@localhost>


Index: drm_bufs.c
===================================================================
RCS file: /data/cvs/src/sys/dev/drm/drm_bufs.c,v
retrieving revision 1.1.1.1.2.9
diff -u -r1.1.1.1.2.9 drm_bufs.c
--- drm_bufs.c  20 Jun 2008 02:14:51 -0000      1.1.1.1.2.9
+++ drm_bufs.c  20 Jun 2008 02:42:39 -0000
@@ -178,7 +178,7 @@
 #endif
                break;
        case _DRM_SHM:
-               map->mem = drm_dmamem_pgalloc(dev, btop(map->size));
+               map->mem = drm_dmamem_pgalloc(dev, btoc(map->size));
                DRM_DEBUG( "%lu %d %p\n",
                           map->size, drm_order(map->size), map->handle );
                if ( map->mem == NULL ) {
Index: drm_pci.c
===================================================================
RCS file: /data/cvs/src/sys/dev/drm/drm_pci.c,v
retrieving revision 1.1.1.1.2.10
diff -u -r1.1.1.1.2.10 drm_pci.c
--- drm_pci.c   20 Jun 2008 02:14:51 -0000      1.1.1.1.2.10
+++ drm_pci.c   20 Jun 2008 02:42:52 -0000
@@ -41,7 +41,7 @@
        if (h == NULL)
                return NULL;
 
-       h->mem = drm_dmamem_pgalloc(dev, round_page(btop(size)));
+       h->mem = drm_dmamem_pgalloc(dev, round_page(btoc(size)));
        if (h->mem == NULL) {
        free(h, M_DRM);
        return NULL;
Index: drm_vm.c
===================================================================
RCS file: /data/cvs/src/sys/dev/drm/drm_vm.c,v
retrieving revision 1.1.1.1.2.9
diff -u -r1.1.1.1.2.9 drm_vm.c
--- drm_vm.c    20 Jun 2008 02:14:51 -0000      1.1.1.1.2.9
+++ drm_vm.c    20 Jun 2008 02:54:04 -0000
@@ -88,13 +88,13 @@
                if (map->type == _DRM_SHM) {
                        if ((roffset >= (uintptr_t)map->handle) && 
                            (roffset < (uintptr_t)map->handle + map->size)) {
-                               DRM_DEBUG("found _DRM_SHM map for offset 
(%lx)\n", roffset);
+                               DRM_DEBUG("found _DRM_SHM map for offset 
(%x)\n", roffset);
                                break;
                        }  
                } else {
                        if ((offset >= map->cookie) && 
                            (offset < map->cookie + map->size)) {
-                       DRM_DEBUG("found cookie (%lx) for offset (%lx)", 
map->cookie, offset);
+                       DRM_DEBUG("found cookie (%lx) for offset (%llx)", 
map->cookie, offset);
                        offset -= map->cookie;
                                break;
                }