1 files changed, 7 insertions, 3 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 11b23f203d68..31c4f0cefdee 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -86,6 +86,7 @@ struct page_cgroup {
         int      flags;
 };
 #define PAGE_CGROUP_FLAG_CACHE  (0x1)   /* charged as cache */
+#define PAGE_CGROUP_FLAG_ACTIVE (0x2)   /* page is active in this cgroup */
 
 enum {
         MEM_CGROUP_TYPE_UNSPEC = 0,
@@ -213,10 +214,13 @@ clear_page_cgroup(struct page *page, struct page_cgroup *pc)
 
 static void __mem_cgroup_move_lists(struct page_cgroup *pc, bool active)
 {
-        if (active)
+        if (active) {
+                pc->flags |= PAGE_CGROUP_FLAG_ACTIVE;
                 list_move(&pc->lru, &pc->mem_cgroup->active_list);
-        else
+        } else {
+                pc->flags &= ~PAGE_CGROUP_FLAG_ACTIVE;
                 list_move(&pc->lru, &pc->mem_cgroup->inactive_list);
+        }
 }
 
 int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem)
@@ -403,7 +407,7 @@ retry:
         atomic_set(&pc->ref_cnt, 1);
         pc->mem_cgroup = mem;
         pc->page = page;
-        pc->flags = 0;
+        pc->flags = PAGE_CGROUP_FLAG_ACTIVE;
         if (ctype == MEM_CGROUP_CHARGE_TYPE_CACHE)
                 pc->flags |= PAGE_CGROUP_FLAG_CACHE;