From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407AbaE0Vjx (ORCPT ); Tue, 27 May 2014 17:39:53 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:51726 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751823AbaE0Vju (ORCPT ); Tue, 27 May 2014 17:39:50 -0400 Date: Tue, 27 May 2014 14:38:40 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Michal Hocko cc: Andrew Morton , Johannes Weiner , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH mmotm/next] vmscan-memcg-always-use-swappiness-of-the-reclaimed-memcg-swappiness-and-o om-control-fix.patch In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org mem_cgroup_swappiness() oopses immediately when booted with cgroup_disable=memory. Fix that in the obvious inelegant way for now - though I hope we are moving towards a world in which almost all of the mem_cgroup_disabled() tests will vanish, with a root_mem_cgroup which can handle the basics even when disabled. Signed-off-by: Hugh Dickins --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- mmotm/mm/memcontrol.c 2014-05-21 18:12:18.072022438 -0700 +++ linux/mm/memcontrol.c 2014-05-21 19:34:30.608546905 -0700 @@ -1531,7 +1531,7 @@ static unsigned long mem_cgroup_margin(s int mem_cgroup_swappiness(struct mem_cgroup *memcg) { /* root ? */ - if (!memcg->css.parent) + if (mem_cgroup_disabled() || !memcg->css.parent) return vm_swappiness; return memcg->swappiness;