aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2012-03-21 19:34:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 20:55:01 -0400
commit2ff76f1193f8481f7e6c29304eea4006e8e51569 (patch)
treea263678dc298e29a0c54bb2e6f98bb1d5ee19751 /include
parent89c06bd52fb9ffceddf84f7309d2e8c9f1666216 (diff)
memcg: remove PCG_FILE_MAPPED
With the new lock scheme for updating memcg's page stat, we don't need a flag PCG_FILE_MAPPED which was duplicated information of page_mapped(). [hughd@google.com: cosmetic fix] [hughd@google.com: add comment to MEM_CGROUP_CHARGE_TYPE_MAPPED case in __mem_cgroup_uncharge_common()] Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Greg Thelen <gthelen@google.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Ying Han <yinghan@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/page_cgroup.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 7a3af748f32b..a88cdba27809 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -6,8 +6,6 @@ enum {
6 PCG_LOCK, /* Lock for pc->mem_cgroup and following bits. */ 6 PCG_LOCK, /* Lock for pc->mem_cgroup and following bits. */
7 PCG_USED, /* this object is in use. */ 7 PCG_USED, /* this object is in use. */
8 PCG_MIGRATION, /* under page migration */ 8 PCG_MIGRATION, /* under page migration */
9 /* flags for mem_cgroup and file and I/O status */
10 PCG_FILE_MAPPED, /* page is accounted as "mapped" */
11 __NR_PCG_FLAGS, 9 __NR_PCG_FLAGS,
12}; 10};
13 11
@@ -66,10 +64,6 @@ TESTPCGFLAG(Used, USED)
66CLEARPCGFLAG(Used, USED) 64CLEARPCGFLAG(Used, USED)
67SETPCGFLAG(Used, USED) 65SETPCGFLAG(Used, USED)
68 66
69SETPCGFLAG(FileMapped, FILE_MAPPED)
70CLEARPCGFLAG(FileMapped, FILE_MAPPED)
71TESTPCGFLAG(FileMapped, FILE_MAPPED)
72
73SETPCGFLAG(Migration, MIGRATION) 67SETPCGFLAG(Migration, MIGRATION)
74CLEARPCGFLAG(Migration, MIGRATION) 68CLEARPCGFLAG(Migration, MIGRATION)
75TESTPCGFLAG(Migration, MIGRATION) 69TESTPCGFLAG(Migration, MIGRATION)