+ memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch added to mm-new branch

+ memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch added to mm-new branch

[Andrew Morton]

The patch titled
     Subject: memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix
has been added to the -mm mm-new branch.  Its filename is
     memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch

This patch will later appear in the mm-new branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix
Date: Thu Apr 10 10:02:52 PM PDT 2025

fix build: s/flag/flags/ in memcg_hotplug_cpu_dead

Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memcontrol.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/mm/memcontrol.c~memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix
+++ a/mm/memcontrol.c
@@ -1964,10 +1964,10 @@ static int memcg_hotplug_cpu_dead(unsign
 
 	stock = &per_cpu(memcg_stock, cpu);
 
-	local_irq_save(flag);
+	local_irq_save(flags);
 	/* stock of a remote dead cpu, no need for stock_lock. */
 	__drain_obj_stock(stock);
-	local_irq_restore(flag);
+	local_irq_restore(flags);
 
 	drain_stock(stock);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

radix-tree-add-missing-cleanuph-fix.patch
samples-livepatch-add-module-descriptions-fix.patch
mm-kasan-add-module-decription-fix.patch
mm-debug-fix-parameter-passed-to-page_mapcount_is_type-fix.patch
vmalloc-switch-to-for_each_vmap_node-helper-fix.patch
memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch