Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

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

diff --git a/drivers/gpu/drm/i915/selftests/i915_random.c b/drivers/gpu/drm/i915/selftests/i915_random.c
index d044bf9a6feb37e6036b44e83a0a70dc1b7f03cb..222c511bea494585b08d9a6c41701065517526bd 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_random.c
+++ b/drivers/gpu/drm/i915/selftests/i915_random.c
@@ -62,7 +62,7 @@ unsigned int *i915_random_order(unsigned int count, struct rnd_state *state)
 {
        unsigned int *order, i;
 
-       order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
+       order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
        if (!order)
                return order;