mm-kmem-make-__memcg_kmem_uncharge-static.patch removed from -mm tree
The patch titled
Subject: mm: kmem: make __memcg_kmem_(un)charge static
has been removed from the -mm tree. Its filename was
mm-kmem-make-__memcg_kmem_uncharge-static.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: mm: kmem: make __memcg_kmem_(un)charge static
I've noticed that __memcg_kmem_charge() and __memcg_kmem_uncharge() are not used anywhere except memcontrol.c. Yet they are not declared as non-static and are declared in memcontrol.h.
This patch makes them static.
---
include/linux/memcontrol.h | 3 --- mm/memcontrol.c | 11 ++++++++--- 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-kmem-make-__memcg_kmem_uncharge-static +0 -3
@@ -1592,9 +1592,6 @@ static inline void memcg_set_shrinker_bi#endif #ifdef CONFIG_MEMCG_KMEM -int __memcg_kmem_charge (struct mem_cgroup *memcg,gfp_t gfp, -unsigned int nr_pages); -void __memcg_kmem_uncharge (struct mem_cgroup *memcg,unsigned int nr_pages);int __memcg_kmem_charge_page (struct page *page,gfp_t gfp,int order);void __memcg_kmem_uncharge_page (struct page *page,int order);
mm/memcontrol.c renamed from mm/memcontrol.c~mm-kmem-make-__memcg_kmem_uncharge-static +8 -3
@@ -255,6 +255,11 @@ struct cgroup_subsys_state *vmpressure_t#ifdef CONFIG_MEMCG_KMEM extern spinlock_t css_set_lock; +static int __memcg_kmem_charge (struct mem_cgroup *memcg,gfp_t gfp, +unsigned int nr_pages); +static void __memcg_kmem_uncharge (struct mem_cgroup *memcg, +unsigned int nr_pages); +static void obj_cgroup_release (struct percpu_ref *ref) { struct obj_cgroup *objcg = container_of(ref, struct obj_cgroup, refcnt);
@@ -3087,8 +3092,8 @@ static void memcg_free_cache_id(int id)* * Returns 0 on success, an error code on failure. */ -int __memcg_kmem_charge (struct mem_cgroup *memcg,gfp_t gfp, -unsigned int nr_pages) +static int __memcg_kmem_charge (struct mem_cgroup *memcg,gfp_t gfp, +unsigned int nr_pages) {struct page_counter *counter;int ret;
@@ -3120,7 +3125,7 @@ int __memcg_kmem_charge(struct mem_cgrou* @memcg: memcg to uncharge * @nr_pages: number of pages to uncharge */ -void __memcg_kmem_uncharge (struct mem_cgroup *memcg,unsigned int nr_pages) +static void __memcg_kmem_uncharge (struct mem_cgroup *memcg,unsigned int nr_pages) {if (!cgroup_subsys_on_dfl (memory_cgrp_subsys))page_counter_uncharge (&memcg->kmem, nr_pages);
_
Patches currently in -mm which might be from [email protected] are
mm-cma-allocate-cma-areas-bottom-up.patch mm-cma-allocate-cma-areas-bottom-up-fix.patch mm-cma-allocate-cma-areas-bottom-up-fix-2.patch mm-cma-allocate-cma-areas-bottom-up-fix-3.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