|
@@ -55,7 +55,6 @@ static int really_do_swap_account __initdata = 1; /* for remember boot option*/
|
|
|
#define do_swap_account (0)
|
|
|
#endif
|
|
|
|
|
|
-static DEFINE_MUTEX(memcg_tasklist); /* can be hold under cgroup_mutex */
|
|
|
#define SOFTLIMIT_EVENTS_THRESH (1000)
|
|
|
|
|
|
/*
|
|
@@ -1481,9 +1480,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
|
|
|
|
|
|
if (!nr_retries--) {
|
|
|
if (oom) {
|
|
|
- mutex_lock(&memcg_tasklist);
|
|
|
mem_cgroup_out_of_memory(mem_over_limit, gfp_mask);
|
|
|
- mutex_unlock(&memcg_tasklist);
|
|
|
record_last_oom(mem_over_limit);
|
|
|
}
|
|
|
goto nomem;
|
|
@@ -3393,12 +3390,10 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
|
|
|
struct task_struct *p,
|
|
|
bool threadgroup)
|
|
|
{
|
|
|
- mutex_lock(&memcg_tasklist);
|
|
|
/*
|
|
|
* FIXME: It's better to move charges of this process from old
|
|
|
* memcg to new memcg. But it's just on TODO-List now.
|
|
|
*/
|
|
|
- mutex_unlock(&memcg_tasklist);
|
|
|
}
|
|
|
|
|
|
struct cgroup_subsys mem_cgroup_subsys = {
|