Add ia64 patch.

[linux-flexiantxendom0-3.2.10.git] / drivers / char / drm / drm_memory_debug.h

diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h
index b189793..b87ecbc 100644 (file)
--- a/drivers/char/drm/drm_memory_debug.h
+++ b/drivers/char/drm/drm_memory_debug.h
@@ -269,7 +269,7 @@ void DRM(free_pages)(unsigned long address, int order, int area)
        }
 }
 
-void *DRM(ioremap)(unsigned long offset, unsigned long size)
+void *DRM(ioremap)(unsigned long offset, unsigned long size, drm_device_t *dev)
 {
        void *pt;
 
@@ -279,7 +279,7 @@ void *DRM(ioremap)(unsigned long offset, unsigned long size)
                return NULL;
        }
 
-       if (!(pt = ioremap(offset, size))) {
+       if (!(pt = drm_ioremap(offset, size, dev))) {
                spin_lock(&DRM(mem_lock));
                ++DRM(mem_stats)[DRM_MEM_MAPPINGS].fail_count;
                spin_unlock(&DRM(mem_lock));
@@ -292,7 +292,7 @@ void *DRM(ioremap)(unsigned long offset, unsigned long size)
        return pt;
 }
 
-void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size)
+void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size, drm_device_t *dev)
 {
        void *pt;
 
@@ -302,7 +302,7 @@ void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size)
                return NULL;
        }
 
-       if (!(pt = ioremap_nocache(offset, size))) {
+       if (!(pt = drm_ioremap_nocache(offset, size, dev))) {
                spin_lock(&DRM(mem_lock));
                ++DRM(mem_stats)[DRM_MEM_MAPPINGS].fail_count;
                spin_unlock(&DRM(mem_lock));
@@ -315,7 +315,7 @@ void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size)
        return pt;
 }
 
-void DRM(ioremapfree)(void *pt, unsigned long size)
+void DRM(ioremapfree)(void *pt, unsigned long size, drm_device_t *dev)
 {
        int alloc_count;
        int free_count;
@@ -324,7 +324,7 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
                DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
                              "Attempt to free NULL pointer\n");
        else
-               iounmap(pt);
+               drm_ioremapfree(pt, size, dev);
 
        spin_lock(&DRM(mem_lock));
        DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_freed += size;