mm: memcontrol: directly access page->memcg_data in mm/page_alloc.c

[linux-2.6-microblaze.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index e2f19bf..56a8103 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1103,7 +1103,7 @@ static inline bool page_expected_state(struct page *page,
        if (unlikely((unsigned long)page->mapping |
                        page_ref_count(page) |
 #ifdef CONFIG_MEMCG
-                       (unsigned long)page_memcg(page) |
+                       page->memcg_data |
 #endif
                        (page->flags & check_flags)))
                return false;
@@ -1128,7 +1128,7 @@ static const char *page_bad_reason(struct page *page, unsigned long flags)
                        bad_reason = "PAGE_FLAGS_CHECK_AT_FREE flag(s) set";
        }
 #ifdef CONFIG_MEMCG
-       if (unlikely(page_memcg(page)))
+       if (unlikely(page->memcg_data))
                bad_reason = "page still charged to cgroup";
 #endif
        return bad_reason;