diff options
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a294b7576070..1aff6c3fcbd8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -55,7 +55,6 @@ static int really_do_swap_account __initdata = 1; /* for remember boot option*/ | |||
55 | #define do_swap_account (0) | 55 | #define do_swap_account (0) |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | static DEFINE_MUTEX(memcg_tasklist); /* can be hold under cgroup_mutex */ | ||
59 | #define SOFTLIMIT_EVENTS_THRESH (1000) | 58 | #define SOFTLIMIT_EVENTS_THRESH (1000) |
60 | 59 | ||
61 | /* | 60 | /* |
@@ -1481,9 +1480,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm, | |||
1481 | 1480 | ||
1482 | if (!nr_retries--) { | 1481 | if (!nr_retries--) { |
1483 | if (oom) { | 1482 | if (oom) { |
1484 | mutex_lock(&memcg_tasklist); | ||
1485 | mem_cgroup_out_of_memory(mem_over_limit, gfp_mask); | 1483 | mem_cgroup_out_of_memory(mem_over_limit, gfp_mask); |
1486 | mutex_unlock(&memcg_tasklist); | ||
1487 | record_last_oom(mem_over_limit); | 1484 | record_last_oom(mem_over_limit); |
1488 | } | 1485 | } |
1489 | goto nomem; | 1486 | goto nomem; |
@@ -3393,12 +3390,10 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss, | |||
3393 | struct task_struct *p, | 3390 | struct task_struct *p, |
3394 | bool threadgroup) | 3391 | bool threadgroup) |
3395 | { | 3392 | { |
3396 | mutex_lock(&memcg_tasklist); | ||
3397 | /* | 3393 | /* |
3398 | * FIXME: It's better to move charges of this process from old | 3394 | * FIXME: It's better to move charges of this process from old |
3399 | * memcg to new memcg. But it's just on TODO-List now. | 3395 | * memcg to new memcg. But it's just on TODO-List now. |
3400 | */ | 3396 | */ |
3401 | mutex_unlock(&memcg_tasklist); | ||
3402 | } | 3397 | } |
3403 | 3398 | ||
3404 | struct cgroup_subsys mem_cgroup_subsys = { | 3399 | struct cgroup_subsys mem_cgroup_subsys = { |