Skip to contentSkip to conversation

mm-memcg-make-memcg1_update_tree-static.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 5, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: memcg: make memcg1_update_tree() static
has been removed from the -mm tree. Its filename was
mm-memcg-make-memcg1_update_tree-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: Roman Gushchin <[email protected]>
Subject: mm: memcg: make memcg1_update_tree() static
Date: Mon, 24 Jun 2024 17:59:03 -0700

memcg1_update_tree() is not used outside of mm/memcontrol-v1.c anymore, define it as static and remove the declaration from the header file.

---

 mm/memcontrol-v1.c |    2 +-
 mm/memcontrol-v1.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcg-make-memcg1_update_tree-static +1 -1
@@ -201,7 +201,7 @@ static unsigned long soft_limit_excess(s
 	return excess;
 }
 
-void memcg1_update_tree(struct mem_cgroup *memcg, int nid)
+static void memcg1_update_tree(struct mem_cgroup *memcg, int nid)
 {
 	unsigned long excess;
 	struct mem_cgroup_per_node *mz;
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-make-memcg1_update_tree-static +0 -1
@@ -5,7 +5,6 @@
 
 #include <linux/cgroup-defs.h>
 
-void memcg1_update_tree(struct mem_cgroup *memcg, int nid);
 void memcg1_remove_from_trees(struct mem_cgroup *memcg);
 
 static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg)

_

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