From 50869ae8fa116a5468120e8fdbc6b9b789f11ae7 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 24 Jan 2012 16:57:42 +0000 Subject: [PATCH] --- yaml --- r: 286635 b: refs/heads/master c: e912b6d27cea198980132f012d14f22247e19ad6 h: refs/heads/master i: 286633: 6f6503cbaae0c287fb0d709067505d0e11cbdce9 286631: b37c2fe8bf5f2638c0966b8f4996df8467c82aac v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/gtt.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d9661ae0aaa..42d96cde12b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1aab02dac690af7ff634d8e1cb3be6a04387eef +refs/heads/master: e912b6d27cea198980132f012d14f22247e19ad6 diff --git a/trunk/drivers/gpu/drm/gma500/gtt.c b/trunk/drivers/gpu/drm/gma500/gtt.c index e770bd190a5c..5d5330f667f1 100644 --- a/trunk/drivers/gpu/drm/gma500/gtt.c +++ b/trunk/drivers/gpu/drm/gma500/gtt.c @@ -20,6 +20,7 @@ */ #include +#include #include "psb_drv.h" @@ -203,9 +204,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) gt->npage = pages; for (i = 0; i < pages; i++) { - /* FIXME: needs updating as per mail from Hugh Dickins */ - p = read_cache_page_gfp(mapping, i, - __GFP_COLD | GFP_KERNEL); + p = shmem_read_mapping_page(mapping, i); if (IS_ERR(p)) goto err; gt->pages[i] = p;