From 5c1b7fced8678036a9bdaf9c26cff48a9986b6d2 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 29 Jul 2009 16:56:52 +1000 Subject: [PATCH] --- yaml --- r: 156027 b: refs/heads/master c: b42db2b12df7b4f7b2ace581a7726cb5bcb2d658 h: refs/heads/master i: 156025: ab648aa1e4d1b15d8bbc0f8bf51fb798d2917115 156023: ac306d3da3e0f14898de72874e99fdd522fc0b69 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_tt.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1e13dacbae4..4eff6ca1f279 100644 --- 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 index 9b2248a80cff..b8b6c4a5f983 100644 --- 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); }