| commit | 5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@starflyer.(none)> | Sat Oct 22 15:25:01 2005 +1000 |
| committer | Dave Airlie <airlied@linux.ie> | Sat Oct 22 15:25:01 2005 +1000 |
| tree | 842b952d5726992ccadade70fec008a357be23ec | |
| parent | 23bfc1a339e98510f2ce25a2764a0cfe195faa9e [diff] [blame] |
merge linus head to drm-mm branch
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 @@ 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);