--- drivers/gpu/drm/i915/i915_gem.c

+++ drivers/gpu/drm/i915/i915_gem.c

@@ -2262,8 +2262,9 @@ i915_gem_object_get_pages(struct drm_gem

mapping = inode->i_mapping;

for (i = 0; i < page_count; i++) {

page = read_cache_page_gfp(mapping, i,

- mapping_gfp_mask (mapping) |

+ GFP_HIGHUSER |

__GFP_COLD |

+ __GFP_RECLAIMABLE |

gfpmask);

if (IS_ERR(page))

goto err_pages;

@@ -3666,6 +3667,7 @@ i915_gem_execbuffer(struct drm_device *d

if (ret != 0) {

DRM_ERROR("copy %d cliprects failed: %d\n",

args->num_cliprects, ret);

+ ret = -EFAULT;

goto pre_mutex_err;

}

}