aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_vm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/drm_vm.c')
-rw-r--r--drivers/char/drm/drm_vm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 95f9fe5daab7..1c7a3c88702c 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -82,7 +82,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
82 struct drm_file *priv = vma->vm_file->private_data; 82 struct drm_file *priv = vma->vm_file->private_data;
83 struct drm_device *dev = priv->head->dev; 83 struct drm_device *dev = priv->head->dev;
84 struct drm_map *map = NULL; 84 struct drm_map *map = NULL;
85 drm_map_list_t *r_list; 85 struct drm_map_list *r_list;
86 drm_hash_item_t *hash; 86 drm_hash_item_t *hash;
87 87
88 /* 88 /*
@@ -97,7 +97,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
97 if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash)) 97 if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash))
98 goto vm_nopage_error; 98 goto vm_nopage_error;
99 99
100 r_list = drm_hash_entry(hash, drm_map_list_t, hash); 100 r_list = drm_hash_entry(hash, struct drm_map_list, hash);
101 map = r_list->map; 101 map = r_list->map;
102 102
103 if (map && map->type == _DRM_AGP) { 103 if (map && map->type == _DRM_AGP) {
@@ -198,7 +198,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
198 struct drm_device *dev = priv->head->dev; 198 struct drm_device *dev = priv->head->dev;
199 struct drm_vma_entry *pt, *temp; 199 struct drm_vma_entry *pt, *temp;
200 struct drm_map *map; 200 struct drm_map *map;
201 drm_map_list_t *r_list; 201 struct drm_map_list *r_list;
202 int found_maps = 0; 202 int found_maps = 0;
203 203
204 DRM_DEBUG("0x%08lx,0x%08lx\n", 204 DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -313,7 +313,7 @@ static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
313 struct drm_map *map = (struct drm_map *) vma->vm_private_data; 313 struct drm_map *map = (struct drm_map *) vma->vm_private_data;
314 struct drm_file *priv = vma->vm_file->private_data; 314 struct drm_file *priv = vma->vm_file->private_data;
315 struct drm_device *dev = priv->head->dev; 315 struct drm_device *dev = priv->head->dev;
316 drm_sg_mem_t *entry = dev->sg; 316 struct drm_sg_mem *entry = dev->sg;
317 unsigned long offset; 317 unsigned long offset;
318 unsigned long map_offset; 318 unsigned long map_offset;
319 unsigned long page_offset; 319 unsigned long page_offset;
@@ -574,7 +574,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
574 return -EINVAL; 574 return -EINVAL;
575 } 575 }
576 576
577 map = drm_hash_entry(hash, drm_map_list_t, hash)->map; 577 map = drm_hash_entry(hash, struct drm_map_list, hash)->map;
578 if (!map || ((map->flags & _DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN))) 578 if (!map || ((map->flags & _DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN)))
579 return -EPERM; 579 return -EPERM;
580 580