Skip to contentSkip to conversation

mm-memcontrol-drop-unused-cpu-argument-from-flush_nmi_stats.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Aug 7

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: memcontrol: drop unused cpu argument from flush_nmi_stats
has been removed from the -mm tree. Its filename was
mm-memcontrol-drop-unused-cpu-argument-from-flush_nmi_stats.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: Guopeng Zhang <[email protected]>
Subject: mm: memcontrol: drop unused cpu argument from flush_nmi_stats
Date: Mon, 13 Jul 2026 17:00:10 +0800

flush_nmi_stats() does not use its cpu argument. Remove it from the function and its !CONFIG_MEMCG_NMI_SAFETY_REQUIRES_ATOMIC stub. The caller still uses cpu for the subsequent per-CPU rstat flush.

No functional change.

---

 mm/memcontrol.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-drop-unused-cpu-argument-from-flush_nmi_stats +3 -5
@@ -4433,8 +4433,7 @@ static void mem_cgroup_stat_aggregate(st
 }
 
 #ifdef CONFIG_MEMCG_NMI_SAFETY_REQUIRES_ATOMIC
-static void flush_nmi_stats(struct mem_cgroup *memcg, struct mem_cgroup *parent,
-			    int cpu)
+static void flush_nmi_stats(struct mem_cgroup *memcg, struct mem_cgroup *parent)
 {
 	int nid;
 
@@ -4485,8 +4484,7 @@ static void flush_nmi_stats(struct mem_c
 	}
 }
 #else
-static void flush_nmi_stats(struct mem_cgroup *memcg, struct mem_cgroup *parent,
-			    int cpu)
+static void flush_nmi_stats(struct mem_cgroup *memcg, struct mem_cgroup *parent)
 {}
 #endif
 
@@ -4498,7 +4496,7 @@ static void mem_cgroup_css_rstat_flush(s
 	struct aggregate_control ac;
 	int nid;
 
-	flush_nmi_stats(memcg, parent, cpu);
+	flush_nmi_stats(memcg, parent);
 
 	statc = per_cpu_ptr(memcg->vmstats_percpu, cpu);
 

_

Patches currently in -mm which might be from [email protected] are

mm-memcg-stop-reclaim-when-a-limit-update-is-superseded.patch