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

Commit 7d828602 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: export root_mem_cgroup 



A later patch will need this symbol in files other than memcontrol.c, so
export it now and replace mem_cgroup_root_css at the same time.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 03640418

include/linux/memcontrol.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,8 @@ struct mem_cgroup { 
	struct mem_cgroup_per_node *nodeinfo[0];

	struct mem_cgroup_per_node *nodeinfo[0];

	/* WARNING: nodeinfo must be the last member here */

	/* WARNING: nodeinfo must be the last member here */

};

};

extern struct cgroup_subsys_state *mem_cgroup_root_css;



extern struct mem_cgroup *root_mem_cgroup;





/**

/**

 * mem_cgroup_events - count memory events against a cgroup

 * mem_cgroup_events - count memory events against a cgroup

mm/backing-dev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -672,7 +672,7 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi) 




	ret = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL);

	ret = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL);

	if (!ret) {

	if (!ret) {

		bdi->wb.memcg_css = mem_cgroup_root_css;

		bdi->wb.memcg_css = &root_mem_cgroup->css;

		bdi->wb.blkcg_css = blkcg_root_css;

		bdi->wb.blkcg_css = blkcg_root_css;

	}

	}

	return ret;

	return ret;

mm/memcontrol.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -76,9 +76,9 @@ 
struct cgroup_subsys memory_cgrp_subsys __read_mostly;

struct cgroup_subsys memory_cgrp_subsys __read_mostly;

EXPORT_SYMBOL(memory_cgrp_subsys);

EXPORT_SYMBOL(memory_cgrp_subsys);





struct mem_cgroup *root_mem_cgroup __read_mostly;



#define MEM_CGROUP_RECLAIM_RETRIES	5

#define MEM_CGROUP_RECLAIM_RETRIES	5

static struct mem_cgroup *root_mem_cgroup __read_mostly;

struct cgroup_subsys_state *mem_cgroup_root_css __read_mostly;





/* Whether the swap controller is active */

/* Whether the swap controller is active */

#ifdef CONFIG_MEMCG_SWAP

#ifdef CONFIG_MEMCG_SWAP
@@ -4241,7 +4241,6 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) 
	/* root ? */

	/* root ? */

	if (parent_css == NULL) {

	if (parent_css == NULL) {

		root_mem_cgroup = memcg;

		root_mem_cgroup = memcg;

		mem_cgroup_root_css = &memcg->css;

		page_counter_init(&memcg->memory, NULL);

		page_counter_init(&memcg->memory, NULL);

		memcg->high = PAGE_COUNTER_MAX;

		memcg->high = PAGE_COUNTER_MAX;

		memcg->soft_limit = PAGE_COUNTER_MAX;

		memcg->soft_limit = PAGE_COUNTER_MAX;