Merge drm-upstream/drm-next into drm-intel-next-queued

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

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 9f7b351621f3b7ed40846ecee57457dcc901e885..c14552ab270bc34a8d67936e74b7a0b72e05b2e9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -792,16 +792,16 @@ int i915_error_state_buf_init(struct drm_i915_error_state_buf *ebuf,
         */
        ebuf->size = count + 1 > PAGE_SIZE ? count + 1 : PAGE_SIZE;
        ebuf->buf = kmalloc(ebuf->size,
-                               GFP_TEMPORARY | __GFP_NORETRY | __GFP_NOWARN);
+                               GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
 
        if (ebuf->buf == NULL) {
                ebuf->size = PAGE_SIZE;
-               ebuf->buf = kmalloc(ebuf->size, GFP_TEMPORARY);
+               ebuf->buf = kmalloc(ebuf->size, GFP_KERNEL);
        }
 
        if (ebuf->buf == NULL) {
                ebuf->size = 128;
-               ebuf->buf = kmalloc(ebuf->size, GFP_TEMPORARY);
+               ebuf->buf = kmalloc(ebuf->size, GFP_KERNEL);
        }
 
        if (ebuf->buf == NULL)