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
Este commit está contenido en:
@@ -142,7 +142,7 @@ static noinline depot_stack_handle_t save_stack(gfp_t flags)
|
||||
.nr_entries = 0,
|
||||
.entries = entries,
|
||||
.max_entries = PAGE_OWNER_STACK_DEPTH,
|
||||
.skip = 0
|
||||
.skip = 2
|
||||
};
|
||||
depot_stack_handle_t handle;
|
||||
|
||||
|
@@ -3685,7 +3685,7 @@ SYSCALL_DEFINE2(memfd_create,
|
||||
if (len > MFD_NAME_MAX_LEN + 1)
|
||||
return -EINVAL;
|
||||
|
||||
name = kmalloc(len + MFD_NAME_PREFIX_LEN, GFP_TEMPORARY);
|
||||
name = kmalloc(len + MFD_NAME_PREFIX_LEN, GFP_KERNEL);
|
||||
if (!name)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@@ -4597,7 +4597,7 @@ static int list_locations(struct kmem_cache *s, char *buf,
|
||||
struct kmem_cache_node *n;
|
||||
|
||||
if (!map || !alloc_loc_track(&t, PAGE_SIZE / sizeof(struct location),
|
||||
GFP_TEMPORARY)) {
|
||||
GFP_KERNEL)) {
|
||||
kfree(map);
|
||||
return sprintf(buf, "Out of memory\n");
|
||||
}
|
||||
|
Referencia en una nueva incidencia
Block a user