memcg-make-v1-only-functions-static.patch removed from -mm tree
The quilt patch titled
Subject: memcg: make v1 only functions static
has been removed from the -mm tree. Its filename was
memcg-make-v1-only-functions-static.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Shakeel Butt <[email protected]>
Subject: memcg: make v1 only functions static
Date: Wed, 14 Aug 2024 22:04:51 -0700
The functions memcg1_charge_statistics() and memcg1_check_events() are never used outside of v1 source file. So, make them static.
Signed-off-by Shakeel Butt <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Muchun Song <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc T.J. Mercier <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol-v1.c | 7 +++++-- mm/memcontrol-v1.h | 6 ------ 2 files changed, 5 insertions(+), 8 deletions(-)
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~memcg-make-v1-only-functions-static +5 -2
@@ -742,6 +742,9 @@ static struct page *mc_handle_file_pte(sreturn folio_file_page (folio, index); } +static void memcg1_check_events (struct mem_cgroup *memcg,int nid); +static void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages); +/** * mem_cgroup_move_account - move account of the folio * @folio: The folio.
@@ -1439,7 +1442,7 @@ static void mem_cgroup_threshold(struct } } -void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages) +static void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages) {/* pagein of a big page is an event. So, ignore page size */ if (nr_pages >0 )
@@ -1484,7 +1487,7 @@ static bool memcg1_event_ratelimit(struc* Check events in order. * */ -void memcg1_check_events (struct mem_cgroup *memcg,int nid) +static void memcg1_check_events (struct mem_cgroup *memcg,int nid) {if (IS_ENABLED (CONFIG_PREEMPT_RT ))return ;
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~memcg-make-v1-only-functions-static +0 -6
@@ -115,9 +115,6 @@ bool memcg1_oom_prepare(struct mem_cgrouvoid memcg1_oom_finish (struct mem_cgroup *memcg,bool locked);void memcg1_oom_recover (struct mem_cgroup *memcg); -void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages); -void memcg1_check_events (struct mem_cgroup *memcg,int nid); -void memcg1_commit_charge (struct folio *folio,struct mem_cgroup *memcg);void memcg1_swapout (struct folio *folio,struct mem_cgroup *memcg); void memcg1_uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
@@ -152,9 +149,6 @@ static inline bool memcg1_oom_prepare(ststatic inline void memcg1_oom_finish (struct mem_cgroup *memcg,bool locked) {}static inline void memcg1_oom_recover (struct mem_cgroup *memcg) {} -static inline void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages) {} -static inline void memcg1_check_events (struct mem_cgroup *memcg,int nid) {} -static inline void memcg1_commit_charge (struct folio *folio,struct mem_cgroup *memcg) {}
_
Patches currently in -mm which might be from [email protected] are