diff options
author | Dave Airlie <airlied@redhat.com> | 2009-03-08 22:47:18 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-03-13 00:24:19 -0400 |
commit | 1847a549ac4db1272dea13d86331c492a2640b3b (patch) | |
tree | 295016bff2d009f7da93a1b2121d1062611d5b3d /drivers/gpu | |
parent | 8f497aade8df2a619eacda927a43ebe82167a84c (diff) |
drm: fix warnings about new mappings in info code.
This fixes up the warnings in the debugfs code that conflicted
with the mapping fixups.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index fc98952b9033..60a1b6cb376a 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c | |||
@@ -72,7 +72,7 @@ int drm_vm_info(struct seq_file *m, void *data) | |||
72 | { | 72 | { |
73 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 73 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
74 | struct drm_device *dev = node->minor->dev; | 74 | struct drm_device *dev = node->minor->dev; |
75 | struct drm_map *map; | 75 | struct drm_local_map *map; |
76 | struct drm_map_list *r_list; | 76 | struct drm_map_list *r_list; |
77 | 77 | ||
78 | /* Hardcoded from _DRM_FRAME_BUFFER, | 78 | /* Hardcoded from _DRM_FRAME_BUFFER, |
@@ -94,9 +94,9 @@ int drm_vm_info(struct seq_file *m, void *data) | |||
94 | else | 94 | else |
95 | type = types[map->type]; | 95 | type = types[map->type]; |
96 | 96 | ||
97 | seq_printf(m, "%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", | 97 | seq_printf(m, "%4d 0x%016llx 0x%08lx %4.4s 0x%02x 0x%08lx ", |
98 | i, | 98 | i, |
99 | map->offset, | 99 | (unsigned long long)map->offset, |
100 | map->size, type, map->flags, | 100 | map->size, type, map->flags, |
101 | (unsigned long) r_list->user_token); | 101 | (unsigned long) r_list->user_token); |
102 | if (map->mtrr < 0) | 102 | if (map->mtrr < 0) |