Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056b7cce authored by Zhang Zhen's avatar Zhang Zhen Committed by Linus Torvalds
Browse files

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: default avatarZhang Zhen <zhenzhang.zhang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd6dace7

include/linux/memcontrol.h

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ int memcg_cache_id(struct mem_cgroup *memcg); 
void memcg_update_array_size(int num_groups);



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);

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)))

		return cachep;



	return __memcg_kmem_get_cache(cachep, gfp);

	return __memcg_kmem_get_cache(cachep);

}

#else

#define for_each_memcg_cache_index(_idx)	\

mm/memcontrol.c

+1 −2
Original line number Diff line number Diff line
@@ -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.

 * This function needs to be called with rcu_read_lock() held.

 */

struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep,

					  gfp_t gfp)

struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep)

{

	struct mem_cgroup *memcg;

	struct kmem_cache *memcg_cachep;