aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorYing Han <yinghan@google.com>2011-05-26 19:25:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 20:12:35 -0400
commit1bac180bd29e03989f50054af97b53b8d37a364a (patch)
tree6797cb73a27c1e8b7d1ea79764356dc69486dad4 /mm
parent4fd14ebf6e3b66423dfac2bc9defda7b83ee07b3 (diff)
memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages()
The caller of the function has been renamed to zone_nr_lru_pages(), and this is just fixing up in the memcg code. The current name is easily to be mis-read as zone's total number of pages. Signed-off-by: Ying Han <yinghan@google.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> 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.c6
-rw-r--r--mm/vmscan.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index bcb0a0bee1fc..cc48a6854f7e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1078,9 +1078,9 @@ int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg)
1078 return (active > inactive); 1078 return (active > inactive);
1079} 1079}
1080 1080
1081unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, 1081unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg,
1082 struct zone *zone, 1082 struct zone *zone,
1083 enum lru_list lru) 1083 enum lru_list lru)
1084{ 1084{
1085 int nid = zone_to_nid(zone); 1085 int nid = zone_to_nid(zone);
1086 int zid = zone_idx(zone); 1086 int zid = zone_idx(zone);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2e8fbacd8744..faa0a088f9cc 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -173,7 +173,7 @@ static unsigned long zone_nr_lru_pages(struct zone *zone,
173 struct scan_control *sc, enum lru_list lru) 173 struct scan_control *sc, enum lru_list lru)
174{ 174{
175 if (!scanning_global_lru(sc)) 175 if (!scanning_global_lru(sc))
176 return mem_cgroup_zone_nr_pages(sc->mem_cgroup, zone, lru); 176 return mem_cgroup_zone_nr_lru_pages(sc->mem_cgroup, zone, lru);
177 177
178 return zone_page_state(zone, NR_LRU_BASE + lru); 178 return zone_page_state(zone, NR_LRU_BASE + lru);
179} 179}