--- a/mm/memcontrol.c~memcg-fix-up-drain_local_stock-comment +++ a/mm/memcontrol.c @@ -2178,8 +2178,9 @@ static void drain_local_stock(struct wor unsigned long flags; /* - * The only protection from memory hotplug vs. drain_stock races is - * that we always operate on local CPU stock here with IRQ disabled + * The only protection from cpu hotplug (memcg_hotplug_cpu_dead) vs. + * drain_stock races is that we always operate on local CPU stock + * here with IRQ disabled */ local_irq_save(flags);