From 4d1beee8f8e95ba7997c36732ad967fbecdb59ea Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Sun, 5 Jun 2016 08:11:13 +0200 Subject: [PATCH 113/365] mm/memcontrol: mem_cgroup_migrate() - replace another local_irq_disable() w. local_lock_irq() v4.6 grew a local_irq_disable() in mm/memcontrol.c::mem_cgroup_migrate(). Convert it to use the existing local lock (event_lock) like the others. Signed-off-by: Mike Galbraith Signed-off-by: Sebastian Andrzej Siewior --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9d5048313e2f..1c39495b1677 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5767,10 +5767,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) commit_charge(newpage, memcg, false); - local_irq_save(flags); + local_lock_irqsave(event_lock, flags); mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages); memcg_check_events(memcg, newpage); - local_irq_restore(flags); + local_unlock_irqrestore(event_lock, flags); } DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key); -- 2.28.0