[folded-merged] memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch removed from -mm tree

[folded-merged] memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix
has been removed from the -mm tree.  Its filename was
     memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock-fix.patch

This patch was dropped because it was folded into memcg-decouple-memcg_hotplug_cpu_dead-from-stock_lock.patch

------------------------------------------------------
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

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.patch