From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE3013D9552 for ; Mon, 13 Jul 2026 09:00:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783933240; cv=none; b=dqISAUP7Gl53lYIXc5FDf2+6BnhryJU4AMlPfzCOBuY2RNI+Uw0Ezah1fO8T+57w4aBdnU6QLU8Lj2muMpptxJpxWdiJcXWdgv+FMqhDJ/Z7XSF5zqWZTUNlBqZUQrdK1mNiavYTLIjAgo4j6TG8ie4wSNoqHNMi/jC5Itn3TvM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783933240; c=relaxed/simple; bh=BEaOcSCFY3l1EWKgxkGj/Hxta6DQzxUzB0uglzdkM/k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DR8F383kP1hSS9MeVcgIwvXCkaLRvNRgJNI4qyvUzbs6AldYCXw6RY+5rgbR5NurXotN8qvcDQ/701MFulIVd08uTe1N0fXoAQFYBu1dXMkR9wXIFZGt6RX95GzKX6rQ0YBjHQQP+tiIf54HTjSPdvICmU3CpCVwYQTXlWaGYRE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=wLpg6rxP; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="wLpg6rxP" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783933237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ioPagpwFTzNhXNYobwbUxjWhxbMrCA+AnLrRpW24boU=; b=wLpg6rxPUtfwOyQVfL2Js9q33etD4FyUadaKjSztAoGnsIdTn4pC0n1JcIqDuc+pj97Am9 T2IicbGvIvptI1eR2hi+k4KtVZRKqplZG2+h5QqWOYGfoUScieHCo0trS8+v1e9M3qlm5t zosLKgCrRF+HDHSGNm9pb9p1hq7cdjE= From: Guopeng Zhang To: Andrew Morton , Shakeel Butt Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Guopeng Zhang Subject: [PATCH] mm: memcontrol: drop unused cpu argument from flush_nmi_stats Date: Mon, 13 Jul 2026 17:00:10 +0800 Message-ID: <20260713090010.2991906-1-guopeng.zhang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Guopeng Zhang 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. Signed-off-by: Guopeng Zhang --- mm/memcontrol.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 22f55aeb94f3..86ed741cc5cd 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -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); -- 2.43.0