merge linus head to drm-mm branch
This commit is contained in:
Родитель
23bfc1a339
Коммит
5fb4dc9bf5
|
@ -155,7 +155,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
|
||||||
offset = address - vma->vm_start;
|
offset = address - vma->vm_start;
|
||||||
i = (unsigned long)map->handle + offset;
|
i = (unsigned long)map->handle + offset;
|
||||||
page = (map->type == _DRM_CONSISTENT) ?
|
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)
|
if (!page)
|
||||||
return NOPAGE_OOM;
|
return NOPAGE_OOM;
|
||||||
get_page(page);
|
get_page(page);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче