mm-memcg-rename-charge-move-related-functions.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcg: rename charge move-related functions
has been removed from the -mm tree. Its filename was
mm-memcg-rename-charge-move-related-functions.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 charge move-related functions
Date: Mon, 24 Jun 2024 17:58:57 -0700
Rename exported function related to the charge move to have the memcg1_ prefix.
---
mm/memcontrol-v1.c | 14 +++++++------- mm/memcontrol-v1.h | 8 ++++---- mm/memcontrol.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-rename-charge-move-related-functions +4 -4
@@ -2580,7 +2580,7 @@ retry:* At task move, charge accounts can be doubly counted. So, it's * better to wait until the end of task_move if something is going on. */ -if (mem_cgroup_wait_acct_move (mem_over_limit)) +if (memcg1_wait_acct_move (mem_over_limit)) goto retry;if (nr_retries--)
@@ -5995,12 +5995,12 @@ struct cgroup_subsys memory_cgrp_subsys .css_free = mem_cgroup_css_free, .css_reset = mem_cgroup_css_reset, .css_rstat_flush = mem_cgroup_css_rstat_flush, - .can_attach = mem_cgroup_can_attach, + .can_attach = memcg1_can_attach,#if defined(CONFIG_LRU_GEN ) || defined(CONFIG_MEMCG_KMEM ) .attach = mem_cgroup_attach, #endif - .cancel_attach = mem_cgroup_cancel_attach, - .post_attach = mem_cgroup_move_task, + .cancel_attach = memcg1_cancel_attach, + .post_attach = memcg1_move_task, #ifdef CONFIG_MEMCG_KMEM .fork = mem_cgroup_fork, .exit = mem_cgroup_exit,
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcg-rename-charge-move-related-functions +7 -7
@@ -384,7 +384,7 @@ unlock:return ret; } -bool mem_cgroup_wait_acct_move (struct mem_cgroup *memcg) +bool memcg1_wait_acct_move (struct mem_cgroup *memcg) {if (mc.moving_task && current != mc.moving_task) {if (mem_cgroup_under_move (memcg)) {
@@ -1056,7 +1056,7 @@ static void mem_cgroup_clear_mc(void)mmput (mm); } -int mem_cgroup_can_attach (struct cgroup_taskset *tset) +int memcg1_can_attach (struct cgroup_taskset *tset) {struct cgroup_subsys_state *css;struct mem_cgroup *memcg =NULL ;/* unneeded init to make gcc happy */
@@ -1126,7 +1126,7 @@ int mem_cgroup_can_attach(struct cgroup_return ret; } -void mem_cgroup_cancel_attach (struct cgroup_taskset *tset) +void memcg1_cancel_attach (struct cgroup_taskset *tset) {if (mc.to)mem_cgroup_clear_mc ();
@@ -1285,7 +1285,7 @@ retry:atomic_dec (&mc.from->moving_account); } -void mem_cgroup_move_task (void ) +void memcg1_move_task (void ) {if (mc.to) {mem_cgroup_move_charge ();
@@ -1294,14 +1294,14 @@ void mem_cgroup_move_task(void) }#else /* !CONFIG_MMU */ -static int mem_cgroup_can_attach (struct cgroup_taskset *tset) +int memcg1_can_attach (struct cgroup_taskset *tset) {return 0 ; } -static void mem_cgroup_cancel_attach (struct cgroup_taskset *tset) +void memcg1_cancel_attach (struct cgroup_taskset *tset) { } -static void mem_cgroup_move_task (void ) +void memcg1_move_task (void ) { }#endif
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-rename-charge-move-related-functions +4 -4
@@ -29,11 +29,11 @@ static inline int try_charge(struct mem_void mem_cgroup_id_get_many (struct mem_cgroup *memcg,unsigned int n);void mem_cgroup_id_put_many (struct mem_cgroup *memcg,unsigned int n); -bool mem_cgroup_wait_acct_move (struct mem_cgroup *memcg); +bool memcg1_wait_acct_move (struct mem_cgroup *memcg);struct cgroup_taskset ; -int mem_cgroup_can_attach (struct cgroup_taskset *tset); -void mem_cgroup_cancel_attach (struct cgroup_taskset *tset); -void mem_cgroup_move_task (void ); +int memcg1_can_attach (struct cgroup_taskset *tset); +void memcg1_cancel_attach (struct cgroup_taskset *tset); +void memcg1_move_task (void );struct cftype ; u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css,
_
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