diff options
Diffstat (limited to 'drivers/char/drm/drm_vm.c')
-rw-r--r-- | drivers/char/drm/drm_vm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 948e60d272df..13bdb1393c36 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c | |||
@@ -81,7 +81,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma, | |||
81 | { | 81 | { |
82 | drm_file_t *priv = vma->vm_file->private_data; | 82 | drm_file_t *priv = vma->vm_file->private_data; |
83 | drm_device_t *dev = priv->head->dev; | 83 | drm_device_t *dev = priv->head->dev; |
84 | drm_map_t *map = NULL; | 84 | struct drm_map *map = NULL; |
85 | drm_map_list_t *r_list; | 85 | drm_map_list_t *r_list; |
86 | drm_hash_item_t *hash; | 86 | drm_hash_item_t *hash; |
87 | 87 | ||
@@ -163,7 +163,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma, | |||
163 | static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, | 163 | static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, |
164 | unsigned long address) | 164 | unsigned long address) |
165 | { | 165 | { |
166 | drm_map_t *map = (drm_map_t *) vma->vm_private_data; | 166 | struct drm_map *map = (struct drm_map *) vma->vm_private_data; |
167 | unsigned long offset; | 167 | unsigned long offset; |
168 | unsigned long i; | 168 | unsigned long i; |
169 | struct page *page; | 169 | struct page *page; |
@@ -197,7 +197,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) | |||
197 | drm_file_t *priv = vma->vm_file->private_data; | 197 | drm_file_t *priv = vma->vm_file->private_data; |
198 | drm_device_t *dev = priv->head->dev; | 198 | drm_device_t *dev = priv->head->dev; |
199 | drm_vma_entry_t *pt, *temp; | 199 | drm_vma_entry_t *pt, *temp; |
200 | drm_map_t *map; | 200 | struct drm_map *map; |
201 | drm_map_list_t *r_list; | 201 | drm_map_list_t *r_list; |
202 | int found_maps = 0; | 202 | int found_maps = 0; |
203 | 203 | ||
@@ -310,7 +310,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma, | |||
310 | static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma, | 310 | static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma, |
311 | unsigned long address) | 311 | unsigned long address) |
312 | { | 312 | { |
313 | drm_map_t *map = (drm_map_t *) vma->vm_private_data; | 313 | struct drm_map *map = (struct drm_map *) vma->vm_private_data; |
314 | drm_file_t *priv = vma->vm_file->private_data; | 314 | drm_file_t *priv = vma->vm_file->private_data; |
315 | drm_device_t *dev = priv->head->dev; | 315 | drm_device_t *dev = priv->head->dev; |
316 | drm_sg_mem_t *entry = dev->sg; | 316 | drm_sg_mem_t *entry = dev->sg; |
@@ -512,7 +512,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) | |||
512 | return 0; | 512 | return 0; |
513 | } | 513 | } |
514 | 514 | ||
515 | unsigned long drm_core_get_map_ofs(drm_map_t * map) | 515 | unsigned long drm_core_get_map_ofs(struct drm_map * map) |
516 | { | 516 | { |
517 | return map->offset; | 517 | return map->offset; |
518 | } | 518 | } |
@@ -547,7 +547,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) | |||
547 | { | 547 | { |
548 | drm_file_t *priv = filp->private_data; | 548 | drm_file_t *priv = filp->private_data; |
549 | drm_device_t *dev = priv->head->dev; | 549 | drm_device_t *dev = priv->head->dev; |
550 | drm_map_t *map = NULL; | 550 | struct drm_map *map = NULL; |
551 | unsigned long offset = 0; | 551 | unsigned long offset = 0; |
552 | drm_hash_item_t *hash; | 552 | drm_hash_item_t *hash; |
553 | 553 | ||