[PATCH] mm: memcontrol: drop superfluous entry in the per-memcg stats array

From	Johannes Weiner <hannes@cmpxchg.org>
Newsgroups	linux.kernel
Subject	[PATCH] mm: memcontrol: drop superfluous entry in the per-memcg stats array
Date	2016-01-26 22:00 +0100
Message-ID	<qViSv-1iC-37@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

MEM_CGROUP_STAT_NSTATS is just a delimiter for cgroup1 statistics, not
an actual array entry. Reuse it for the first cgroup2 stat entry, like
in the event array.

Fixes: b2807f07f4f8 ("mm: memcontrol: add "sock" to cgroup2 memory.stat")
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
 include/linux/memcontrol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 9ae48d4aeb5e..792c8981e633 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -51,7 +51,7 @@ enum mem_cgroup_stat_index {
 	MEM_CGROUP_STAT_SWAP,		/* # of pages, swapped out */
 	MEM_CGROUP_STAT_NSTATS,
 	/* default hierarchy stats */
-	MEMCG_SOCK,
+	MEMCG_SOCK = MEM_CGROUP_STAT_NSTATS,
 	MEMCG_NR_STAT,
 };
 
-- 
2.7.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mm: memcontrol: drop superfluous entry in the per-memcg stats array Johannes Weiner <hannes@cmpxchg.org> - 2016-01-26 22:00 +0100
  Re: [PATCH] mm: memcontrol: drop superfluous entry in the per-memcg  stats array Andrew Morton <akpm@linux-foundation.org> - 2016-01-26 22:40 +0100
    Re: [PATCH] mm: memcontrol: drop superfluous entry in the per-memcg  stats array Johannes Weiner <hannes@cmpxchg.org> - 2016-01-26 22:50 +0100

csiph-web