From 3f7d07f04a6ae42407131e65f4d645f7f6f1a150 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Jul 2010 09:44:37 -0700
Subject: [PATCH] --- yaml --- r: 201019 b: refs/heads/master c:
 cd9f040df6ce46573760a507cb88192d05d27d86 h: refs/heads/master i:   201017:
 fbf8d2140778ee1c472264d90447b55bebb7f86c   201015:
 5eee9fe2f953969ff840a24bd416288e8ad37d1e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d2d32a7c1a9b..de8fb9c99fb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f469461df6ff822f71b8737bda86eea20f16ff93
+refs/heads/master: cd9f040df6ce46573760a507cb88192d05d27d86
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 074385882ccf..8757ecf6e96b 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2241,6 +2241,7 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,
 		page = read_cache_page_gfp(mapping, i,
 					   GFP_HIGHUSER |
 					   __GFP_COLD |
+					   __GFP_RECLAIMABLE |
 					   gfpmask);
 		if (IS_ERR(page))
 			goto err_pages;