Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c792e824 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

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



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: b2807f07 ("mm: memcontrol: add "sock" to cgroup2 memory.stat")
Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 461c7fa1

include/linux/memcontrol.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

};