drm: missing drm_vm.c changes for consistent maps
authorDave Airlie <airlied@starflyer.(none)>
Sun, 11 Sep 2005 09:37:29 +0000 (19:37 +1000)
committerDave Airlie <airlied@linux.ie>
Sun, 11 Sep 2005 09:37:29 +0000 (19:37 +1000)
This adds a missing change from CVS for consistent maps.

Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/drm_vm.c

index ced4215..a13d07f 100644 (file)
@@ -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);