mm: memcg/slab: remove unused argument by charge_slab_page()

charge_slab_page() is not using the gfp argument anymore,
remove it.

Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Link: http://lkml.kernel.org/r/20200707173612.124425-1-guro@fb.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/slab.c b/mm/slab.c
index 684ebe5b0c7a3635450b76c546d545fdb3c47bbd..92e6f1228526f73f67eb17fc8f00ef90eddad9c7 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
                return NULL;
        }
 
-       charge_slab_page(page, flags, cachep->gfporder, cachep);
+       charge_slab_page(page, cachep->gfporder, cachep);
        __SetPageSlab(page);
        /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */
        if (sk_memalloc_socks() && page_is_pfmemalloc(page))

diff --git a/mm/slab.h b/mm/slab.h
index ec8e22ee65440b6f817bb58f565751970f34ef44..853a4bd0ede57803bd96b8b9693331bd58f2b533 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -423,8 +423,7 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)
        return page->slab_cache;
 }
 
-static __always_inline void charge_slab_page(struct page *page,
-                                            gfp_t gfp, int order,
+static __always_inline void charge_slab_page(struct page *page, int order,
                                             struct kmem_cache *s)
 {
        mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),

diff --git a/mm/slub.c b/mm/slub.c
index eba8f57d5734b7d7981d798e4886b7522386cace..9440c68ffc059b068b3d80bd01bf6324b69f29cb 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s,
                page = __alloc_pages_node(node, flags, order);
 
        if (page)
-               charge_slab_page(page, flags, order, s);
+               charge_slab_page(page, order, s);
 
        return page;
 }