diff options
author | Wanpeng Li <liwp@linux.vnet.ibm.com> | 2012-07-31 19:43:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:43 -0400 |
commit | ab2158848775c7918288f2c423d3e4dbbc7d34eb (patch) | |
tree | 96e1bbb83f38be4b5ef499733bc2e15c418a2380 | |
parent | 567fb435bb7a37afda35902b884562c40756dc45 (diff) |
memcg: rename mem_control_xxx to memcg_xxx
Replace memory_cgroup_xxx() with memcg_xxx()
Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/memcontrol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6d3dd54ec429..b11fb2fe77c1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -4006,7 +4006,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp, | |||
4006 | #endif | 4006 | #endif |
4007 | 4007 | ||
4008 | #ifdef CONFIG_NUMA | 4008 | #ifdef CONFIG_NUMA |
4009 | static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft, | 4009 | static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft, |
4010 | struct seq_file *m) | 4010 | struct seq_file *m) |
4011 | { | 4011 | { |
4012 | int nid; | 4012 | int nid; |
@@ -4065,7 +4065,7 @@ static inline void mem_cgroup_lru_names_not_uptodate(void) | |||
4065 | BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS); | 4065 | BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS); |
4066 | } | 4066 | } |
4067 | 4067 | ||
4068 | static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, | 4068 | static int memcg_stat_show(struct cgroup *cont, struct cftype *cft, |
4069 | struct seq_file *m) | 4069 | struct seq_file *m) |
4070 | { | 4070 | { |
4071 | struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); | 4071 | struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); |
@@ -4579,7 +4579,7 @@ static struct cftype mem_cgroup_files[] = { | |||
4579 | }, | 4579 | }, |
4580 | { | 4580 | { |
4581 | .name = "stat", | 4581 | .name = "stat", |
4582 | .read_seq_string = mem_control_stat_show, | 4582 | .read_seq_string = memcg_stat_show, |
4583 | }, | 4583 | }, |
4584 | { | 4584 | { |
4585 | .name = "force_empty", | 4585 | .name = "force_empty", |
@@ -4611,7 +4611,7 @@ static struct cftype mem_cgroup_files[] = { | |||
4611 | #ifdef CONFIG_NUMA | 4611 | #ifdef CONFIG_NUMA |
4612 | { | 4612 | { |
4613 | .name = "numa_stat", | 4613 | .name = "numa_stat", |
4614 | .read_seq_string = mem_control_numa_stat_show, | 4614 | .read_seq_string = memcg_numa_stat_show, |
4615 | }, | 4615 | }, |
4616 | #endif | 4616 | #endif |
4617 | #ifdef CONFIG_MEMCG_SWAP | 4617 | #ifdef CONFIG_MEMCG_SWAP |