diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-22 15:25:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-22 15:25:01 +1000 |
| commit | 5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf (patch) | |
| tree | 842b952d5726992ccadade70fec008a357be23ec /drivers | |
| parent | 23bfc1a339e98510f2ce25a2764a0cfe195faa9e (diff) | |
| download | op-kernel-dev-5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf.zip op-kernel-dev-5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf.tar.gz | |
merge linus head to drm-mm branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/drm/drm_vm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index e84a787..3f73aa7 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c @@ -155,7 +155,7 @@ 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 = (map->type == _DRM_CONSISTENT) ? - virt_to_page((void *)i) : vmalloc_to_page((void *)i); + virt_to_page((void *)i) : vmalloc_to_page((void *)i); if (!page) return NOPAGE_OOM; get_page(page); |
