From 682c6ed0293771b093452597540118f47fda1adf Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu, 14 Sep 2006 12:17:38 +0200
Subject: Remove the use of reserved pages, and use locked pages instead.
 Update compatibility for latest linux versions.

---
 linux-core/drm_vm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_vm.c')

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;
 }
 
-- 
cgit v1.2.3