Skip to contentSkip to conversation

mm: memcontrol: drop unused cpu argument from flush_nmi_stats

PATCH Applied Guopeng Zhang 5 participants 5 messages Jul 13 – Jul 14

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm: memcontrol: drop unused cpu argument from flush_nmi_stats

From: Guopeng Zhang <[email protected]>

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 +3 -5
index 22f55aeb94f3..86ed741cc5cd 100644
@@ -4433,8 +4433,7 @@ static void mem_cgroup_stat_aggregate(struct aggregate_control *ac)
 }
 
 #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;
 
@@ -4480,8 +4479,7 @@ static void flush_nmi_stats(struct mem_cgroup *memcg, struct mem_cgroup *parent,
 	}
 }
 #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
 
@@ -4493,7 +4491,7 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu)
 	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);
 
Signature · 1 line
2.43.0
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Guopeng Zhang

From: Guopeng Zhang <[email protected]>

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.

Looks like a left over from prior versions of the patch because there was no use in the 940b01fc8dc1a

Thanks!

Signature · 2 lines
Michal Hocko
SUSE Labs