This patchset aims to clean up the kernel memory charging API. It doesn't bring any functional changes, just removes unused arguments, duplicate definitions, renames some functions and fixes some comments. Currently it's not obvious which functions are most basic (memcg_kmem_(un)charge_memcg()) and which are based on them (memcg_kmem_(un)charge()). The patchset renames these functions and removes unused arguments: TL;DR: was: memcg_kmem_charge_memcg(page, gfp, order, memcg) memcg_kmem_uncharge_memcg(memcg, nr_pages) memcg_kmem_charge(page, gfp, order) memcg_kmem_uncharge(page, order) now: memcg_kmem_charge(memcg, gfp, nr_pages) memcg_kmem_uncharge(memcg, nr_pages) memcg_kmem_charge_page(page, gfp, order) memcg_kmem_uncharge_page(page, order) Roman Gushchin (7): mm: kmem: remove duplicate definitions of __memcg_kmem_(un)charge() mm: kmem: cleanup (__)memcg_kmem_charge_memcg() arguments mm: kmem: cleanup memcg_kmem_uncharge_memcg() arguments mm: kmem: rename memcg_kmem_(un)charge() into memcg_kmem_(un)charge_page() mm: kmem: switch to nr_pages in (__)memcg_kmem_charge_memcg() mm: memcg/slab: cache page number in memcg_(un)charge_slab() mm: kmem: rename (__)memcg_kmem_(un)charge_memcg() to __memcg_kmem_(un)charge() fs/pipe.c | 2 +- include/linux/memcontrol.h | 46 ++++++++++++++------------------ kernel/fork.c | 9 ++++--- mm/memcontrol.c | 54 ++++++++++++++++++-------------------- mm/page_alloc.c | 4 +-- mm/slab.h | 22 +++++++++------- 6 files changed, 65 insertions(+), 72 deletions(-) -- 2.21.1