The patch titled Subject: mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix has been added to the -mm tree. Its filename is mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-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-make-cgroup-stats-and-events-query-api-explicitly-local-fix The lruvec_page_state() -> lruvec_page_state_local() rename should have been part of this patch, not the previous one. Link: http://lkml.kernel.org/r/20190417160347.GC23013@xxxxxxxxxxx Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/vmscan.c~mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix +++ a/mm/vmscan.c @@ -2966,7 +2966,7 @@ static void snapshot_refaults(struct mem struct lruvec *lruvec; lruvec = mem_cgroup_lruvec(pgdat, memcg); - refaults = lruvec_page_state(lruvec, WORKINGSET_ACTIVATE); + refaults = lruvec_page_state_local(lruvec, WORKINGSET_ACTIVATE); lruvec->refaults = refaults; } while ((memcg = mem_cgroup_iter(root_memcg, memcg, NULL))); } _ Patches currently in -mm which might be from hannes@xxxxxxxxxxx are mm-fix-inactive-list-balancing-between-numa-nodes-and-cgroups.patch mm-fix-inactive-list-balancing-between-numa-nodes-and-cgroups-fix.patch mm-memcontrol-track-lru-counts-in-the-vmstats-array.patch mm-memcontrol-replace-zone-summing-with-lruvec_page_state.patch mm-memcontrol-replace-node-summing-with-memcg_page_state.patch mm-memcontrol-push-down-mem_cgroup_node_nr_lru_pages.patch mm-memcontrol-push-down-mem_cgroup_nr_lru_pages.patch mm-memcontrol-quarantine-the-mem_cgroup_nr_lru_pages-api.patch mm-fix-false-positive-overcommit_guess-failures.patch mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local.patch mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix.patch mm-memcontrol-move-stat-event-counting-functions-out-of-line.patch mm-memcontrol-fix-recursive-statistics-correctness-scalabilty.patch mm-memcontrol-fix-numa-round-robin-reclaim-at-intermediate-level.patch