summaryrefslogtreecommitdiff
path: root/linux-core/drm_vm.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-14 12:17:38 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-14 12:17:38 +0200
commit682c6ed0293771b093452597540118f47fda1adf (patch)
tree71400326deeec5b87c4316b8bb904ddccf5f4c56 /linux-core/drm_vm.c
parent9adc9584a7e0b61b16a943720bef31a71faeaef4 (diff)
Remove the use of reserved pages, and use locked pages instead.
Update compatibility for latest linux versions.
Diffstat (limited to 'linux-core/drm_vm.c')
-rw-r--r--linux-core/drm_vm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index e7b808cc..aed0e04f 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -276,16 +276,17 @@ static __inline__ struct page *drm_do_vm_ttm_nopage(struct vm_area_struct *vma,
++bm->cur_pages;
page = ttm->pages[page_offset] =
alloc_page(GFP_KERNEL);
- SetPageReserved(page);
}
if (!page)
return NOPAGE_OOM;
+ SetPageLocked(page);
+ get_page(page);
+
default_prot = vm_get_page_prot(vma->vm_flags);
BUG_ON(page_flags & DRM_TTM_PAGE_UNCACHED);
vma->vm_page_prot = default_prot;
-
return page;
}