|
@@ -3538,12 +3538,6 @@ static int memcg_activate_kmem(struct mem_cgroup *memcg,
|
|
if (memcg_kmem_is_active(memcg))
|
|
if (memcg_kmem_is_active(memcg))
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- /*
|
|
|
|
- * We are going to allocate memory for data shared by all memory
|
|
|
|
- * cgroups so let's stop accounting here.
|
|
|
|
- */
|
|
|
|
- memcg_stop_kmem_account();
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* For simplicity, we won't allow this to be disabled. It also can't
|
|
* For simplicity, we won't allow this to be disabled. It also can't
|
|
* be changed if the cgroup has children already, or if tasks had
|
|
* be changed if the cgroup has children already, or if tasks had
|
|
@@ -3588,7 +3582,6 @@ static int memcg_activate_kmem(struct mem_cgroup *memcg,
|
|
*/
|
|
*/
|
|
memcg_kmem_set_active(memcg);
|
|
memcg_kmem_set_active(memcg);
|
|
out:
|
|
out:
|
|
- memcg_resume_kmem_account();
|
|
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|