diff options
-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 3e4199830456..42882c1e7fce 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -5489,7 +5489,6 @@ void mem_cgroup_uncharge_list(struct list_head *page_list) | |||
5489 | * be uncharged upon free. | 5489 | * be uncharged upon free. |
5490 | * | 5490 | * |
5491 | * Both pages must be locked, @newpage->mapping must be set up. | 5491 | * Both pages must be locked, @newpage->mapping must be set up. |
5492 | * Either or both pages might be on the LRU already. | ||
5493 | */ | 5492 | */ |
5494 | void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) | 5493 | void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) |
5495 | { | 5494 | { |
@@ -5524,7 +5523,7 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) | |||
5524 | page_counter_charge(&memcg->memsw, nr_pages); | 5523 | page_counter_charge(&memcg->memsw, nr_pages); |
5525 | css_get_many(&memcg->css, nr_pages); | 5524 | css_get_many(&memcg->css, nr_pages); |
5526 | 5525 | ||
5527 | commit_charge(newpage, memcg, true); | 5526 | commit_charge(newpage, memcg, false); |
5528 | 5527 | ||
5529 | local_irq_disable(); | 5528 | local_irq_disable(); |
5530 | mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages); | 5529 | mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages); |