mm-memcg-rename-memcg_check_events.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcg: rename memcg_check_events()
has been removed from the -mm tree. Its filename was
mm-memcg-rename-memcg_check_events.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: Roman Gushchin <[email protected]>
Subject: mm: memcg: rename memcg_check_events()
Date: Mon, 24 Jun 2024 17:58:59 -0700
Rename memcg_check_events() into memcg1_check_events() for consistency with other cgroup v1-specific functions.
---
mm/memcontrol-v1.c | 6 +++--- mm/memcontrol-v1.h | 2 +- mm/memcontrol.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-rename-memcg_check_events +4 -4
@@ -2630,7 +2630,7 @@ void mem_cgroup_commit_charge(struct follocal_irq_disable ();mem_cgroup_charge_statistics (memcg,folio_nr_pages (folio)); -memcg_check_events (memcg,folio_nid (folio)); +memcg1_check_events (memcg,folio_nid (folio));local_irq_enable (); }
@@ -5662,7 +5662,7 @@ static void uncharge_batch(const structlocal_irq_save (flags);__count_memcg_events (ug->memcg,PGPGOUT , ug->pgpgout);__this_cpu_add (ug->memcg->vmstats_percpu->nr_page_events, ug->nr_memory); -memcg_check_events (ug->memcg, ug->nid); +memcg1_check_events (ug->memcg, ug->nid);local_irq_restore (flags);/* drop reference from uncharge_folio */
@@ -5801,7 +5801,7 @@ void mem_cgroup_replace_folio(struct follocal_irq_save (flags);mem_cgroup_charge_statistics (memcg, nr_pages); -memcg_check_events (memcg,folio_nid (new)); +memcg1_check_events (memcg,folio_nid (new));local_irq_restore (flags); }
@@ -6070,7 +6070,7 @@ void mem_cgroup_swapout(struct folio *fomemcg_stats_lock ();mem_cgroup_charge_statistics (memcg, -nr_entries);memcg_stats_unlock (); -memcg_check_events (memcg,folio_nid (folio)); +memcg1_check_events (memcg,folio_nid (folio));css_put (&memcg->css); }
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcg-rename-memcg_check_events +3 -3
@@ -835,9 +835,9 @@ static int mem_cgroup_move_account(struclocal_irq_disable ();mem_cgroup_charge_statistics (to, nr_pages); -memcg_check_events (to, nid); +memcg1_check_events (to, nid);mem_cgroup_charge_statistics (from, -nr_pages); -memcg_check_events (from, nid); +memcg1_check_events (from, nid);local_irq_enable (); out:return ret;
@@ -1424,7 +1424,7 @@ static void mem_cgroup_threshold(struct* Check events in order. * */ -void memcg_check_events (struct mem_cgroup *memcg,int nid) +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~mm-memcg-rename-memcg_check_events +1 -1
@@ -12,7 +12,7 @@ static inline void memcg1_soft_limit_res }void mem_cgroup_charge_statistics (struct mem_cgroup *memcg,int nr_pages); -void memcg_check_events (struct mem_cgroup *memcg,int nid); +void memcg1_check_events (struct mem_cgroup *memcg,int nid);void memcg_oom_recover (struct mem_cgroup *memcg);int try_charge_memcg (struct mem_cgroup *memcg,gfp_t gfp_mask,unsigned int nr_pages);
_
Patches currently in -mm which might be from [email protected] are
mm-memcg-drop-obsolete-cache-line-padding-in-struct-mem_cgroup.patch mm-memcg-add-cache-line-padding-to-mem_cgroup_per_node.patch