aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memcontrol.h
diff options
context:
space:
mode:
authorZhang Zhen <zhenzhang.zhang@huawei.com>2014-12-12 19:55:38 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-13 15:42:47 -0500
commit056b7ccef4bc670b1ed77181159c8228de0926ab (patch)
treeb7574a864baed1928bcb6840c2b3c6ec746e3652 /include/linux/memcontrol.h
parentbd6dace78b9e4595d29892f806514518449c7489 (diff)
mm/memcontrol.c: remove the unused arg in __memcg_kmem_get_cache()
The gfp was passed in but never used in this function. Signed-off-by: Zhang Zhen <zhenzhang.zhang@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r--include/linux/memcontrol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 6ea9f919e888..b74942a9e22f 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -401,7 +401,7 @@ int memcg_cache_id(struct mem_cgroup *memcg);
401void memcg_update_array_size(int num_groups); 401void memcg_update_array_size(int num_groups);
402 402
403struct kmem_cache * 403struct kmem_cache *
404__memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp); 404__memcg_kmem_get_cache(struct kmem_cache *cachep);
405 405
406int __memcg_charge_slab(struct kmem_cache *cachep, gfp_t gfp, int order); 406int __memcg_charge_slab(struct kmem_cache *cachep, gfp_t gfp, int order);
407void __memcg_uncharge_slab(struct kmem_cache *cachep, int order); 407void __memcg_uncharge_slab(struct kmem_cache *cachep, int order);
@@ -492,7 +492,7 @@ memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp)
492 if (unlikely(fatal_signal_pending(current))) 492 if (unlikely(fatal_signal_pending(current)))
493 return cachep; 493 return cachep;
494 494
495 return __memcg_kmem_get_cache(cachep, gfp); 495 return __memcg_kmem_get_cache(cachep);
496} 496}
497#else 497#else
498#define for_each_memcg_cache_index(_idx) \ 498#define for_each_memcg_cache_index(_idx) \