forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm/memcontrol.c: remove the unused arg in __memcg_kmem_get_cache()

Browse source 
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>
This commit is contained in:
Zhang Zhen 2014-12-12 16:55:38 -08:00 • committed by Linus Torvalds
commit 056b7ccef4
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/memcontrol.h
View file

@ -401,7 +401,7 @@ int memcg_cache_id(struct mem_cgroup *memcg);
void memcg_update_array_size(int num_groups); void memcg_update_array_size(int num_groups);
struct kmem_cache * struct kmem_cache *
__memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp); __memcg_kmem_get_cache(struct kmem_cache *cachep);
int __memcg_charge_slab(struct kmem_cache *cachep, gfp_t gfp, int order); int __memcg_charge_slab(struct kmem_cache *cachep, gfp_t gfp, int order);
void __memcg_uncharge_slab(struct kmem_cache *cachep, int order); void __memcg_uncharge_slab(struct kmem_cache *cachep, int order);
@ -492,7 +492,7 @@ memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp)
if (unlikely(fatal_signal_pending(current))) if (unlikely(fatal_signal_pending(current)))
return cachep; return cachep;
return __memcg_kmem_get_cache(cachep, gfp); return __memcg_kmem_get_cache(cachep);
} }
#else #else
#define for_each_memcg_cache_index(_idx) \ #define for_each_memcg_cache_index(_idx) \

3
mm/memcontrol.c
View file

@ -2804,8 +2804,7 @@ void __memcg_uncharge_slab(struct kmem_cache *cachep, int order)
* Can't be called in interrupt context or from kernel threads. * Can't be called in interrupt context or from kernel threads.
* This function needs to be called with rcu_read_lock() held. * This function needs to be called with rcu_read_lock() held.
*/ */
struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep, struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep)
gfp_t gfp)
{ {
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
struct kmem_cache *memcg_cachep; struct kmem_cache *memcg_cachep;