From 43754cbf9e8a8ae0b0bf1a73d87edd6c14657257 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Tue, 29 May 2012 15:07:05 -0700 Subject: [PATCH] --- yaml --- r: 308923 b: refs/heads/master c: 6104621de4ffd94d66eae59cedc70d742a92316b h: refs/heads/master i: 308921: 42cf7d9bcbc5950d6e6c298873bb6ccb67d8f7fb 308919: d01eb3149251be6bfd142191684fc8fe134a07ed v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2091dd23cba0..d36663368f2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb +refs/heads/master: 6104621de4ffd94d66eae59cedc70d742a92316b diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 37bae5571a47..6f0c5e7f9197 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -88,7 +88,6 @@ enum mem_cgroup_stat_index { MEM_CGROUP_STAT_RSS, /* # of pages charged as anon rss */ MEM_CGROUP_STAT_FILE_MAPPED, /* # of pages charged as file rss */ MEM_CGROUP_STAT_SWAPOUT, /* # of pages, swapped out */ - MEM_CGROUP_STAT_DATA, /* end of data requires synchronization */ MEM_CGROUP_STAT_NSTATS, }; @@ -2135,7 +2134,7 @@ static void mem_cgroup_drain_pcp_counter(struct mem_cgroup *memcg, int cpu) int i; spin_lock(&memcg->pcp_counter_lock); - for (i = 0; i < MEM_CGROUP_STAT_DATA; i++) { + for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) { long x = per_cpu(memcg->stat->count[i], cpu); per_cpu(memcg->stat->count[i], cpu) = 0;