diff options
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 395fd8e4166a..c5285afe2048 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -591,7 +591,6 @@ retry: | |||
591 | mem_cgroup_out_of_memory(mem, gfp_mask); | 591 | mem_cgroup_out_of_memory(mem, gfp_mask); |
592 | goto out; | 592 | goto out; |
593 | } | 593 | } |
594 | congestion_wait(WRITE, HZ/10); | ||
595 | } | 594 | } |
596 | 595 | ||
597 | pc->ref_cnt = 1; | 596 | pc->ref_cnt = 1; |
@@ -599,7 +598,7 @@ retry: | |||
599 | pc->page = page; | 598 | pc->page = page; |
600 | pc->flags = PAGE_CGROUP_FLAG_ACTIVE; | 599 | pc->flags = PAGE_CGROUP_FLAG_ACTIVE; |
601 | if (ctype == MEM_CGROUP_CHARGE_TYPE_CACHE) | 600 | if (ctype == MEM_CGROUP_CHARGE_TYPE_CACHE) |
602 | pc->flags |= PAGE_CGROUP_FLAG_CACHE; | 601 | pc->flags = PAGE_CGROUP_FLAG_CACHE; |
603 | 602 | ||
604 | lock_page_cgroup(page); | 603 | lock_page_cgroup(page); |
605 | if (page_get_page_cgroup(page)) { | 604 | if (page_get_page_cgroup(page)) { |