The patch titled
Subject: mm-page_ext-remove-unnecessary-stack_trace-field-fix
has been removed from the -mm tree. Its filename was
mm-page_ext-remove-unnecessary-stack_trace-field-fix.patch
This patch was dropped because it was folded into mm-page_ext-remove-unnecessary-stack_trace-field.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_ext-remove-unnecessary-stack_trace-field-fix
use struct initializers
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Sergei Rogachev <rogachevsergei@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_owner.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff -puN mm/page_owner.c~mm-page_ext-remove-unnecessary-stack_trace-field-fix mm/page_owner.c
--- a/mm/page_owner.c~mm-page_ext-remove-unnecessary-stack_trace-field-fix
+++ a/mm/page_owner.c
@@ -59,15 +59,14 @@ void __reset_page_owner(struct page *pag
void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask)
{
- struct page_ext *page_ext;
- struct stack_trace trace;
+ struct page_ext *page_ext = lookup_page_ext(page);
+ struct stack_trace trace = {
+ .nr_entries = 0,
+ .max_entries = ARRAY_SIZE(page_ext->trace_entries),
+ .entries = &page_ext->trace_entries[0],
+ .skip = 3,
+ };
- page_ext = lookup_page_ext(page);
-
- trace.nr_entries = 0;
- trace.max_entries = ARRAY_SIZE(page_ext->trace_entries);
- trace.entries = &page_ext->trace_entries[0];
- trace.skip = 3;
save_stack_trace(&trace);
page_ext->order = order;
@@ -83,8 +82,11 @@ print_page_owner(char __user *buf, size_
{
int ret;
int pageblock_mt, page_mt;
- struct stack_trace trace;
char *kbuf;
+ struct stack_trace trace = {
+ .nr_entries = page_ext->nr_entries,
+ .entries = &page_ext->trace_entries[0],
+ };
kbuf = kmalloc(count, GFP_KERNEL);
if (!kbuf)
@@ -122,9 +124,6 @@ print_page_owner(char __user *buf, size_
if (ret >= count)
goto err;
- trace.nr_entries = page_ext->nr_entries;
- trace.entries = &page_ext->trace_entries[0];
-
ret += snprint_stack_trace(kbuf + ret, count - ret, &trace, 0);
if (ret >= count)
goto err;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-page_allocc-__alloc_pages_nodemask-dont-alter-arg-gfp_mask.patch
vmscan-force-scan-offline-memory-cgroups.patch
mm-memcontrol-default-hierarchy-interface-for-memory.patch
mm-memcontrol-fold-move_anon-and-move_file.patch
mm-compaction-enhance-tracepoint-output-for-compaction-begin-end.patch
mm-thp-allocate-transparent-hugepages-on-local-node.patch
docs-procs-describe-proc-pid-map_files-entry.patch
mm-page_ext-remove-unnecessary-stack_trace-field.patch
mm-fix-arithmetic-overflow-in-__vm_enough_memory-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
