Merge branch 'for-3.20/bdi' of git://git.kernel.dk/linux-block

[linux-beck.git] / mm / slab.h

diff --git a/mm/slab.h b/mm/slab.h
index 1cf4005482dd1db91925c65dc394ea3c587f6a4f..90430d6f665e6259e4f70c9546ca621e9b9e5d99 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -235,7 +235,7 @@ static __always_inline int memcg_charge_slab(struct kmem_cache *s,
                return 0;
        if (is_root_cache(s))
                return 0;
-       return __memcg_charge_slab(s, gfp, order);
+       return memcg_charge_kmem(s->memcg_params->memcg, gfp, 1 << order);
 }
 
 static __always_inline void memcg_uncharge_slab(struct kmem_cache *s, int order)
@@ -244,7 +244,7 @@ static __always_inline void memcg_uncharge_slab(struct kmem_cache *s, int order)
                return;
        if (is_root_cache(s))
                return;
-       __memcg_uncharge_slab(s, order);
+       memcg_uncharge_kmem(s->memcg_params->memcg, 1 << order);
 }
 #else
 static inline bool is_root_cache(struct kmem_cache *s)