The patch titled
Subject: mm-memcontrol-dump-memorystat-during-cgroup-oom-fix
has been added to the -mm tree. Its filename is
mm-memcontrol-dump-memorystat-during-cgroup-oom-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrol-dump-memorystat-during-cgroup-oom-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrol-dump-memorystat-during-cgroup-oom-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm-memcontrol-dump-memorystat-during-cgroup-oom-fix
s/kvmalloc/kmalloc/ per Michal
Link: http://lkml.kernel.org/r/20190605161133.GA12453@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/memcontrol.c~mm-memcontrol-dump-memorystat-during-cgroup-oom-fix
+++ a/mm/memcontrol.c
@@ -1362,7 +1362,7 @@ static char *memory_stat_format(struct m
struct seq_buf s;
int i;
- seq_buf_init(&s, kvmalloc(PAGE_SIZE, GFP_KERNEL), PAGE_SIZE);
+ seq_buf_init(&s, kmalloc(PAGE_SIZE, GFP_KERNEL), PAGE_SIZE);
if (!s.buffer)
return NULL;
@@ -1524,7 +1524,7 @@ void mem_cgroup_print_oom_meminfo(struct
if (!buf)
return;
pr_info("%s", buf);
- kvfree(buf);
+ kfree(buf);
}
/*
@@ -5761,7 +5761,7 @@ static int memory_stat_show(struct seq_f
if (!buf)
return -ENOMEM;
seq_puts(m, buf);
- kvfree(buf);
+ kfree(buf);
return 0;
}
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
mm-memcontrol-dont-batch-updates-of-local-vm-stats-and-events.patch
mm-memcontrol-dump-memorystat-during-cgroup-oom.patch
mm-memcontrol-dump-memorystat-during-cgroup-oom-fix.patch
