aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2012-05-29 15:07:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 16:22:28 -0700
commitfad02c2de0623fc6d4ff12ca72b60ea521118681 (patch)
treec94040481a13fae1215176356606e7f322affdad
parentmm: memcg: keep ratelimit counter separate from event counters (diff)
downloadlinux-dev-fad02c2de0623fc6d4ff12ca72b60ea521118681.tar.xz
linux-dev-fad02c2de0623fc6d4ff12ca72b60ea521118681.zip
mm: memcg: group swapped-out statistics counter logically
The counter of currently swapped out pages in a memcg (hierarchy) is sitting amidst ever-increasing event counters. Move this item to the other counters that reflect current state rather than history. This technically breaks the kernel ABI, but hopefully nobody relies on the order of items in memory.stat. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Ying Han <yinghan@google.com> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index b7b230606f2c..1118e02a40b6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4043,9 +4043,9 @@ enum {
MCS_CACHE,
MCS_RSS,
MCS_FILE_MAPPED,
+ MCS_SWAP,
MCS_PGPGIN,
MCS_PGPGOUT,
- MCS_SWAP,
MCS_PGFAULT,
MCS_PGMAJFAULT,
MCS_INACTIVE_ANON,
@@ -4064,9 +4064,9 @@ static const char *memcg_stat_strings[NR_MCS_STAT] = {
"cache",
"rss",
"mapped_file",
+ "swap",
"pgpgin",
"pgpgout",
- "swap",
"pgfault",
"pgmajfault",
"inactive_anon",