Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab215884 authored by Wanpeng Li's avatar Wanpeng Li Committed by Linus Torvalds
Browse files

memcg: rename mem_control_xxx to memcg_xxx 



Replace memory_cgroup_xxx() with memcg_xxx()

Signed-off-by: default avatarWanpeng Li <liwp.linux@gmail.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 567fb435

mm/memcontrol.c

+4 −4
Original line number Diff line number Diff line
@@ -4006,7 +4006,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp, 
#endif



#ifdef CONFIG_NUMA

static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft,

static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft,

				      struct seq_file *m)

{

	int nid;
@@ -4065,7 +4065,7 @@ static inline void mem_cgroup_lru_names_not_uptodate(void) 
	BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS);

}



static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,

static int memcg_stat_show(struct cgroup *cont, struct cftype *cft,

				 struct seq_file *m)

{

	struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
@@ -4579,7 +4579,7 @@ static struct cftype mem_cgroup_files[] = { 
	},

	{

		.name = "stat",

		.read_seq_string = mem_control_stat_show,

		.read_seq_string = memcg_stat_show,

	},

	{

		.name = "force_empty",
@@ -4611,7 +4611,7 @@ static struct cftype mem_cgroup_files[] = { 
#ifdef CONFIG_NUMA

	{

		.name = "numa_stat",

		.read_seq_string = mem_control_numa_stat_show,

		.read_seq_string = memcg_numa_stat_show,

	},

#endif

#ifdef CONFIG_MEMCG_SWAP