diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-14 12:25:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-14 12:25:34 -0700 |
| commit | 7a95bdb092c66b6473aa2fc848862ae557ab08f7 (patch) | |
| tree | 0975b8f39455808af726198cb7b2f10616bd61ae /drivers/gpu/drm/lib/drm_random.c | |
| parent | 11a19c7b099f96d00a8dec52bfbb8475e89b6745 (diff) | |
| parent | 5f48f0bd4e368425db4424b9afd1bd251d32367a (diff) | |
| download | linux-7a95bdb092c66b6473aa2fc848862ae557ab08f7.tar.bz2 | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"A few leftovers"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, page_owner: skip unnecessary stack_trace entries
arm64: stacktrace: avoid listing stacktrace functions in stacktrace
mm: treewide: remove GFP_TEMPORARY allocation flag
IB/mlx4: fix sprintf format warning
fscache: fix fscache_objlist_show format processing
lib/test_bitmap.c: use ULL suffix for 64-bit constants
procfs: remove unused variable
drivers/media/cec/cec-adap.c: fix build with gcc-4.4.4
idr: remove WARN_ON_ONCE() when trying to replace negative ID
Diffstat (limited to 'drivers/gpu/drm/lib/drm_random.c')
| -rw-r--r-- | drivers/gpu/drm/lib/drm_random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/lib/drm_random.c b/drivers/gpu/drm/lib/drm_random.c index 7b12a68c3b54..a78c4b483e8d 100644 --- a/drivers/gpu/drm/lib/drm_random.c +++ b/drivers/gpu/drm/lib/drm_random.c @@ -28,7 +28,7 @@ unsigned int *drm_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; |