mm-memcg-slab-remove-unused-argument-by-charge_slab_page.patch removed from -mm tree
The patch titled
Subject: mm: memcg/slab: remove unused argument by charge_slab_page()
has been removed from the -mm tree. Its filename was
mm-memcg-slab-remove-unused-argument-by-charge_slab_page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: mm: memcg/slab: remove unused argument by charge_slab_page()
charge_slab_page() is not using the gfp argument anymore, remove it.
---
mm/slab.c | 2 +- mm/slab.h | 3 +-- mm/slub.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
mm/slab.c renamed from mm/slab.c~mm-memcg-slab-remove-unused-argument-by-charge_slab_page +1 -1
@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(structreturn 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))
mm/slab.h renamed from mm/slab.h~mm-memcg-slab-remove-unused-argument-by-charge_slab_page +1 -2
@@ -423,8 +423,7 @@ static inline struct kmem_cache *virt_toreturn 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),
mm/slub.c renamed from mm/slub.c~mm-memcg-slab-remove-unused-argument-by-charge_slab_page +1 -1
@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_pa page =__alloc_pages_node (node, flags, order);if (page) -charge_slab_page (page, flags, order, s); +charge_slab_page (page, order, s);return page; }
_
Patches currently in -mm which might be from [email protected] are
percpu-return-number-of-released-bytes-from-pcpu_free_area.patch mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch mm-memcg-percpu-per-memcg-percpu-memory-statistics.patch mm-memcg-percpu-per-memcg-percpu-memory-statistics-v3.patch mm-memcg-charge-memcg-percpu-memory-to-the-parent-cgroup.patch kselftests-cgroup-add-perpcu-memory-accounting-test.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch