Unverified Commit b558250d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12696 mm: memcg: don't periodically flush stats when memcg is disabled 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JD5QFPMYN3G6MAYXCWOEZNENH2GFPDHA/ 
 
https://gitee.com/openeuler/kernel/issues/IB0CT3 
 
Link:https://gitee.com/openeuler/kernel/pulls/12696

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 6870a36f 853f9a23

mm/memcontrol.c

+1 −1
Original line number Diff line number Diff line
@@ -5952,7 +5952,7 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) 
	refcount_set(&memcg->id.ref, 1);

	css_get(css);



	if (unlikely(mem_cgroup_is_root(memcg)))

	if (unlikely(mem_cgroup_is_root(memcg)) && !mem_cgroup_disabled())

		queue_delayed_work(system_unbound_wq, &stats_flush_dwork,

				   2UL*HZ);

	return 0;