summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_proc.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@optimus.(none)>2007-11-05 12:37:41 +1000
committerDave Airlie <airlied@redhat.com>2008-02-07 15:09:38 +1000
commit8562b3f25d6e23c9d9e48a32672944d1e8a2aa97 (patch)
treef1fdadd4a7f40c9bf2b67e2c8307c4fba1a06d6e /drivers/char/drm/drm_proc.c
parent488b5ec871191359b9b79262a3d48456dae7ea5f (diff)
downloadop-kernel-dev-8562b3f25d6e23c9d9e48a32672944d1e8a2aa97.zip
op-kernel-dev-8562b3f25d6e23c9d9e48a32672944d1e8a2aa97.tar.gz
drm: some minor cleanups and changes to make memory manager merging easier.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_proc.c')
-rw-r--r--drivers/char/drm/drm_proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 12dfea8..d9b560f 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -236,11 +236,11 @@ 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%08x ",
+ DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,
map->offset,
map->size, type, map->flags,
- r_list->user_token);
+ (unsigned long) r_list->user_token);
if (map->mtrr < 0) {
DRM_PROC_PRINT("none\n");
} else {
OpenPOWER on IntegriCloud