From: Dave Airlie <airlied@starflyer.(none)>
Date: Sun, 11 Sep 2005 09:37:29 +0000 (+1000)
Subject: drm: missing drm_vm.c changes for consistent maps
X-Git-Tag: v2.6.15-rc1~18^2~14^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70dfcfea4b728ab26af1a3e0f331cc63a7e3554b;p=linux-2.6

drm: missing drm_vm.c changes for consistent maps

This adds a missing change from CVS for consistent maps.

Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index ced4215e22..a13d07f442 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -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);