mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
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
This commit is contained in:
commit
7a95bdb092
44 changed files with 83 additions and 76 deletions
|
|
@ -362,7 +362,7 @@ static int *get_random_order(int count)
|
|||
int *order;
|
||||
int n, r, tmp;
|
||||
|
||||
order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
|
||||
order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
|
||||
if (!order)
|
||||
return order;
|
||||
|
||||
|
|
|
|||
|
|
@ -702,7 +702,7 @@ static void append_filter_err(struct filter_parse_state *ps,
|
|||
int pos = ps->lasterr_pos;
|
||||
char *buf, *pbuf;
|
||||
|
||||
buf = (char *)__get_free_page(GFP_TEMPORARY);
|
||||
buf = (char *)__get_free_page(GFP_KERNEL);
|
||||
if (!buf)
|
||||
return;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue