The patch titled
Subject: mm/memcontrol.c: remove the unused arg in __memcg_kmem_get_cache()
has been removed from the -mm tree. Its filename was
mm-remove-the-useless-gfp-in-__memcg_kmem_get_cache.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Zhang Zhen <zhenzhang.zhang@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 4 ++--
mm/memcontrol.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff -puN include/linux/memcontrol.h~mm-remove-the-useless-gfp-in-__memcg_kmem_get_cache include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-remove-the-useless-gfp-in-__memcg_kmem_get_cache
+++ a/include/linux/memcontrol.h
@@ -401,7 +401,7 @@ int memcg_cache_id(struct mem_cgroup *me
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 *
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) \
diff -puN mm/memcontrol.c~mm-remove-the-useless-gfp-in-__memcg_kmem_get_cache mm/memcontrol.c
--- a/mm/memcontrol.c~mm-remove-the-useless-gfp-in-__memcg_kmem_get_cache
+++ a/mm/memcontrol.c
@@ -2804,8 +2804,7 @@ void __memcg_uncharge_slab(struct kmem_c
* 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;
_
Patches currently in -mm which might be from zhenzhang.zhang@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
