drm: Make drm_local_map use a resource_size_t offset

[pandora-kernel.git] / drivers / gpu / drm / drm_proc.c

diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index 8df849f..2e3f907 100644 (file)
--- a/drivers/gpu/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c
@@ -247,7 +247,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
        struct drm_minor *minor = (struct drm_minor *) data;
        struct drm_device *dev = minor->dev;
        int len = 0;
-       struct drm_map *map;
+       struct drm_local_map *map;
        struct drm_map_list *r_list;
 
        /* Hardcoded from _DRM_FRAME_BUFFER,
@@ -276,9 +276,9 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
                        type = "??";
                else
                        type = types[map->type];
-               DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
+               DRM_PROC_PRINT("%4d 0x%08llx 0x%08lx %4.4s  0x%02x 0x%08lx ",
                               i,
-                              map->offset,
+                              (unsigned long long)map->offset,
                               map->size, type, map->flags,
                               (unsigned long) r_list->user_token);
                if (map->mtrr < 0) {