From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751738AbcFEGLV (ORCPT ); Sun, 5 Jun 2016 02:11:21 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37546 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbcFEGLT (ORCPT ); Sun, 5 Jun 2016 02:11:19 -0400 Message-ID: <1465107073.4263.3.camel@gmail.com> Subject: [patch] mm/memcontrol.c::mem_cgroup_migrate() - replace another local_irq_disable() w. local_lock_irq() From: Mike Galbraith To: Sebastian Andrzej Siewior , Thomas Gleixner Cc: LKML , linux-rt-users , Steven Rostedt Date: Sun, 05 Jun 2016 08:11:13 +0200 In-Reply-To: <20160603104424.GA18975@linutronix.de> References: <20160603104424.GA18975@linutronix.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.5 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5557,10 +5557,10 @@ void mem_cgroup_migrate(struct page *old commit_charge(newpage, memcg, false); - local_irq_disable(); + local_lock_irq(event_lock); mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages); memcg_check_events(memcg, newpage); - local_irq_enable(); + local_unlock_irq(event_lock); } DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);