mm: memcontrol/slab: Use helpers to access slab page's memcg_data

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

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 3968d68..0054b48 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2899,7 +2899,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,
        if (!vec)
                return -ENOMEM;
 
-       if (cmpxchg(&page->memcg_data, 0, (unsigned long)vec | 0x1UL))
+       if (!set_page_objcgs(page, vec))
                kfree(vec);
        else
                kmemleak_not_leak(vec);
@@ -2933,12 +2933,12 @@ struct mem_cgroup *mem_cgroup_from_obj(void *p)
         * Memcg membership data for each individual object is saved in
         * the page->obj_cgroups.
         */
-       if (page_has_obj_cgroups(page)) {
+       if (page_objcgs_check(page)) {
                struct obj_cgroup *objcg;
                unsigned int off;
 
                off = obj_to_index(page->slab_cache, page, p);
-               objcg = page_obj_cgroups(page)[off];
+               objcg = page_objcgs(page)[off];
                if (objcg)
                        return obj_cgroup_memcg(objcg);