---

yaml --- r: 335673 b: refs/heads/master c: ac207ed h: refs/heads/master i: 335671: 90ce4a5 v: v3
git-mirror · Nov 15, 2012 · 932892f · 932892f
1 parent 2cd8905
commit 932892f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 888155bbf63a5f955d7a45932ff05e848f715bf0
+refs/heads/master: ac207ed2471150e06af0afc76e4becc701fa2733
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -749,7 +749,10 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
 	/* clear the pages coming from the pool if requested */
 	if (flags & TTM_PAGE_FLAG_ZERO_ALLOC) {
 		list_for_each_entry(p, &plist, lru) {
-			clear_page(page_address(p));
+			if (PageHighMem(p))
+				clear_highpage(p);
+			else
+				clear_page(page_address(p));
 		}
 	}