mm/mmap.c: fix arithmetic overflow in __vm_enough_memory()

[linux-2.6-microblaze.git] / mm / slab.h

diff --git a/mm/slab.h b/mm/slab.h
index 1cf4005..90430d6 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)