Merge tag 'drm-intel-next-fixes-2017-04-27' of git://anongit.freedesktop.org/git...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 92343343044fdcbaeb0d55de0ee3d8bc310d3d5a..532a577ff7a14e8f56613f605bb515833f7cc615 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2340,7 +2340,7 @@ rebuild_st:
                         * defer the oom here by reporting the ENOMEM back
                         * to userspace.
                         */
-                       reclaim = mapping_gfp_constraint(mapping, 0);
+                       reclaim = mapping_gfp_mask(mapping);
                        reclaim |= __GFP_NORETRY; /* reclaim, but no oom */
 
                        page = shmem_read_mapping_page_gfp(mapping, i, reclaim);