diff options
| author | Sean Paul | 2017-09-21 23:18:46 +0200 |
|---|---|---|
| committer | Sean Paul | 2017-09-21 23:18:46 +0200 |
| commit | 1ebfc603d046f1dda6507d11803f9b4046cee712 (patch) | |
| tree | 3be6790f2ce819929b1ccff7993c636e0944705a /drivers/gpu/drm/i915/selftests/i915_random.c | |
| parent | qxl: fix primary surface handling (diff) | |
| parent | Merge tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | kernel-qcow2-linux-1ebfc603d046f1dda6507d11803f9b4046cee712.tar.gz kernel-qcow2-linux-1ebfc603d046f1dda6507d11803f9b4046cee712.tar.xz kernel-qcow2-linux-1ebfc603d046f1dda6507d11803f9b4046cee712.zip | |
Merge remote-tracking branch 'origin/master' into drm-misc-fixes
Pick up 4.14-rc1
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/i915_random.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_random.c b/drivers/gpu/drm/i915/selftests/i915_random.c index d044bf9a6feb..222c511bea49 100644 --- 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; |