---

yaml --- r: 308927 b: refs/heads/master c: fad02c2 h: refs/heads/master i: 308925: f59f4f9 308923: 43754cb 308919: d01eb31 308911: a210cde 308895: 6050aa0 308863: 60a4fa2 v: v3
git-mirror · May 29, 2012 · 1547bde · 1547bde
1 parent 4763d72
commit 1547bde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13114716c744afe165c2148c944ed0306658921c
+refs/heads/master: fad02c2de0623fc6d4ff12ca72b60ea521118681
diff --git a/trunk/mm/memcontrol.c b/trunk/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",