aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index baf3b535b180..3dfb56a93117 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2614,7 +2614,7 @@ static void commit_charge(struct page *page, struct mem_cgroup *memcg,
2614 * have the page locked 2614 * have the page locked
2615 */ 2615 */
2616 pc->mem_cgroup = memcg; 2616 pc->mem_cgroup = memcg;
2617 pc->flags = PCG_USED | PCG_MEM; 2617 pc->flags = PCG_USED;
2618 2618
2619 if (lrucare) 2619 if (lrucare)
2620 unlock_page_lru(page, isolated); 2620 unlock_page_lru(page, isolated);
@@ -6156,8 +6156,6 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage,
6156 if (!PageCgroupUsed(pc)) 6156 if (!PageCgroupUsed(pc))
6157 return; 6157 return;
6158 6158
6159 VM_BUG_ON_PAGE(!(pc->flags & PCG_MEM), oldpage);
6160
6161 if (lrucare) 6159 if (lrucare)
6162 lock_page_lru(oldpage, &isolated); 6160 lock_page_lru(oldpage, &isolated);
6163 6161