Skip to content

Commit

Permalink
drm: missing drm_vm.c changes for consistent maps
Browse files Browse the repository at this point in the history
This adds a missing change from CVS for consistent maps.

Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Dave Airlie authored and Dave Airlie committed Sep 11, 2005
1 parent 908f9c4 commit 70dfcfe
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/char/drm/drm_vm.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,

offset = address - vma->vm_start;
i = (unsigned long)map->handle + offset;
page = vmalloc_to_page((void *)i);
page = (map->type == _DRM_CONSISTENT) ?
virt_to_page((void *)i) : vmalloc_to_page((void *)i);
if (!page)
return NOPAGE_OOM;
get_page(page);
Expand Down

0 comments on commit 70dfcfe

Please sign in to comment.