diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-11 19:37:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-09-11 19:37:29 +1000 |
| commit | 70dfcfea4b728ab26af1a3e0f331cc63a7e3554b (patch) | |
| tree | ec53b9f73f2b6186b572e0129b8bcf829ad9b96b /drivers/char | |
| parent | 908f9c485042e516bb3749f4361129a94772fe26 (diff) | |
| download | op-kernel-dev-70dfcfea4b728ab26af1a3e0f331cc63a7e3554b.zip op-kernel-dev-70dfcfea4b728ab26af1a3e0f331cc63a7e3554b.tar.gz | |
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/drm/drm_vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index ced4215..a13d07f 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); |
