The patch titled
Subject: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
has been added to the -mm tree. Its filename is
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-rename-ambiguously-named-memorystat-counters-and-functions-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
fix it for preceding changes
Cc: Chris Down <chris@xxxxxxxxxxxxxx>
Cc: Dennis Zhou <dennis@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/mm/memcontrol.c~mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
+++ a/mm/memcontrol.c
@@ -3920,11 +3920,11 @@ struct wb_domain *mem_cgroup_wb_domain(s
*/
static unsigned long memcg_exact_page_state(struct mem_cgroup *memcg, int idx)
{
- long x = atomic_long_read(&memcg->stat[idx]);
+ long x = atomic_long_read(&memcg->vmstats[idx]);
int cpu;
for_each_online_cpu(cpu)
- x += per_cpu_ptr(memcg->stat_cpu, cpu)->count[idx];
+ x += per_cpu_ptr(memcg->vmstats_percpu, cpu)->stat[idx];
if (x < 0)
x = 0;
return x;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
bitmap_parselist-move-non-parser-logic-to-helpers-fix.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
convert-struct-pid-count-to-refcount_t-fix.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
