diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2012-05-29 18:07:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 19:22:27 -0400 |
commit | 6104621de4ffd94d66eae59cedc70d742a92316b (patch) | |
tree | b3e84fba03bde89409d8707029e743f238ef8d46 /mm | |
parent | 04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb (diff) |
mm: memcg: remove obsolete statistics array boundary enum item
MEM_CGROUP_STAT_DATA is a leftover from when item counters were living in
the same array as ever-increasing event counters. It's no longer needed,
use MEM_CGROUP_STAT_NSTATS to iterate over the stat array.
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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memcontrol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 37bae5571a47..6f0c5e7f9197 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -88,7 +88,6 @@ enum mem_cgroup_stat_index { | |||
88 | MEM_CGROUP_STAT_RSS, /* # of pages charged as anon rss */ | 88 | MEM_CGROUP_STAT_RSS, /* # of pages charged as anon rss */ |
89 | MEM_CGROUP_STAT_FILE_MAPPED, /* # of pages charged as file rss */ | 89 | MEM_CGROUP_STAT_FILE_MAPPED, /* # of pages charged as file rss */ |
90 | MEM_CGROUP_STAT_SWAPOUT, /* # of pages, swapped out */ | 90 | MEM_CGROUP_STAT_SWAPOUT, /* # of pages, swapped out */ |
91 | MEM_CGROUP_STAT_DATA, /* end of data requires synchronization */ | ||
92 | MEM_CGROUP_STAT_NSTATS, | 91 | MEM_CGROUP_STAT_NSTATS, |
93 | }; | 92 | }; |
94 | 93 | ||
@@ -2135,7 +2134,7 @@ static void mem_cgroup_drain_pcp_counter(struct mem_cgroup *memcg, int cpu) | |||
2135 | int i; | 2134 | int i; |
2136 | 2135 | ||
2137 | spin_lock(&memcg->pcp_counter_lock); | 2136 | spin_lock(&memcg->pcp_counter_lock); |
2138 | for (i = 0; i < MEM_CGROUP_STAT_DATA; i++) { | 2137 | for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) { |
2139 | long x = per_cpu(memcg->stat->count[i], cpu); | 2138 | long x = per_cpu(memcg->stat->count[i], cpu); |
2140 | 2139 | ||
2141 | per_cpu(memcg->stat->count[i], cpu) = 0; | 2140 | per_cpu(memcg->stat->count[i], cpu) = 0; |