mm-memcg-rename-memcg_oom_recover.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcg: rename memcg_oom_recover()
has been removed from the -mm tree. Its filename was
mm-memcg-rename-memcg_oom_recover.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_oom_recover()
Date: Mon, 24 Jun 2024 17:59:01 -0700
Rename memcg_oom_recover() into memcg1_oom_recover() for consistency with other memory cgroup v1-related functions.
Move the declaration in mm/memcontrol-v1.h to be nearby other memcg v1 oom handling functions.
---
mm/memcontrol-v1.c | 6 +++--- mm/memcontrol-v1.h | 2 +- mm/memcontrol.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-rename-memcg_oom_recover +3 -3
@@ -3165,7 +3165,7 @@ static int mem_cgroup_resize_max(struct }while (true);if (!ret && enlarge) -memcg_oom_recover (memcg); +memcg1_oom_recover (memcg);return ret; }
@@ -3750,7 +3750,7 @@ static int mem_cgroup_oom_control_write(WRITE_ONCE (memcg->oom_kill_disable, val);if (!val) -memcg_oom_recover (memcg); +memcg1_oom_recover (memcg);return 0 ; }
@@ -5444,7 +5444,7 @@ static void uncharge_batch(const structpage_counter_uncharge (&ug->memcg->memsw, ug->nr_memory);if (ug->nr_kmem)memcg_account_kmem (ug->memcg, -ug->nr_kmem); -memcg_oom_recover (ug->memcg); +memcg1_oom_recover (ug->memcg); }local_irq_save (flags);
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcg-rename-memcg_oom_recover +3 -3
@@ -1090,8 +1090,8 @@ static void __mem_cgroup_clear_mc(void) mc.moved_swap =0 ; } -memcg_oom_recover (from); -memcg_oom_recover (to); +memcg1_oom_recover (from); +memcg1_oom_recover (to);wake_up_all (&mc.waitq); }
@@ -2067,7 +2067,7 @@ static int memcg_oom_wake_function(wait_return autoremove_wake_function (wait, mode, sync, arg); } -void memcg_oom_recover (struct mem_cgroup *memcg) +void memcg1_oom_recover (struct mem_cgroup *memcg) {/* * For the following lockless ->under_oom test, the only required
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-rename-memcg_oom_recover +1 -1
@@ -13,7 +13,6 @@ static inline void memcg1_soft_limit_resvoid mem_cgroup_charge_statistics (struct mem_cgroup *memcg,int nr_pages);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);
@@ -92,5 +91,6 @@ ssize_t memcg_write_event_control(structbool memcg1_oom_prepare (struct mem_cgroup *memcg,bool *locked);void memcg1_oom_finish (struct mem_cgroup *memcg,bool locked); +void memcg1_oom_recover (struct mem_cgroup *memcg);#endif /* __MM_MEMCONTROL_V1_H */
_
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