On Mon, Apr 15, 2019 at 06:51:32PM -0700, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > The patch titled > Subject: mm: memcontrol: make cgroup stats and events query API explicitly local > has been added to the -mm tree. Its filename is > mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local.patch >From 65f026fe5481f8dc32b3dc3b97994f8cdc82dd17 Mon Sep 17 00:00:00 2001 From: Johannes Weiner <hannes@xxxxxxxxxxx> Date: Wed, 17 Apr 2019 11:08:47 -0400 Subject: [PATCH] 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. Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 871c661ca8be..6e99a8b9b2ad 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2979,7 +2979,7 @@ static void snapshot_refaults(struct mem_cgroup *root_memcg, pg_data_t *pgdat) 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))); } -- 2.21.0
