diff options
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r-- | include/linux/memcontrol.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7c95af8d552c..fb212e1d700d 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -403,10 +403,9 @@ void memcg_update_array_size(int num_groups); | |||
403 | struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep); | 403 | struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep); |
404 | void __memcg_kmem_put_cache(struct kmem_cache *cachep); | 404 | void __memcg_kmem_put_cache(struct kmem_cache *cachep); |
405 | 405 | ||
406 | int __memcg_charge_slab(struct kmem_cache *cachep, gfp_t gfp, int order); | 406 | int memcg_charge_kmem(struct mem_cgroup *memcg, gfp_t gfp, |
407 | void __memcg_uncharge_slab(struct kmem_cache *cachep, int order); | 407 | unsigned long nr_pages); |
408 | 408 | void memcg_uncharge_kmem(struct mem_cgroup *memcg, unsigned long nr_pages); | |
409 | int __memcg_cleanup_cache_params(struct kmem_cache *s); | ||
410 | 409 | ||
411 | /** | 410 | /** |
412 | * memcg_kmem_newpage_charge: verify if a new kmem allocation is allowed. | 411 | * memcg_kmem_newpage_charge: verify if a new kmem allocation is allowed. |