---

yaml --- r: 156027 b: refs/heads/master c: b42db2b h: refs/heads/master i: 156025: ab648aa 156023: ac306d3 v: v3
git-mirror · Jul 29, 2009 · 5c1b7fc · 5c1b7fc
1 parent 21c4a18
commit 5c1b7fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3c13bd8c2ed1d3670bd72e60f562a427355fdf
+refs/heads/master: b42db2b12df7b4f7b2ace581a7726cb5bcb2d658
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_tt.c b/trunk/drivers/gpu/drm/ttm/ttm_tt.c
@@ -137,13 +137,15 @@ static void ttm_tt_free_page_directory(struct ttm_tt *ttm)
 
 static struct page *ttm_tt_alloc_page(unsigned page_flags)
 {
-	gfp_t gfp_flags = GFP_HIGHUSER;
+	gfp_t gfp_flags = GFP_USER;
 
 	if (page_flags & TTM_PAGE_FLAG_ZERO_ALLOC)
 		gfp_flags |= __GFP_ZERO;
 
 	if (page_flags & TTM_PAGE_FLAG_DMA32)
 		gfp_flags |= __GFP_DMA32;
+	else
+		gfp_flags |= __GFP_HIGHMEM;
 
 	return alloc_page(gfp_flags);
 }