---

yaml --- r: 357989 b: refs/heads/master c: 419fa72 h: refs/heads/master i: 357987: 93b3f6a v: v3
git-mirror · Jan 17, 2013 · 6913484 · 6913484
1 parent c8e633f
commit 6913484
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43e28f092b2fa4ebc46bdc210134a80610815785
+refs/heads/master: 419fa72a1973c9ba2fd2c2505dc889f54b857459
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1113,7 +1113,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
 	}
 
 	exec2_list = kmalloc(sizeof(*exec2_list)*args->buffer_count,
-			     GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
+			     GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);
 	if (exec2_list == NULL)
 		exec2_list = drm_malloc_ab(sizeof(*exec2_list),
 					   args->buffer_count);