From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx140.postini.com [74.125.245.140]) by kanga.kvack.org (Postfix) with SMTP id DAD9E6B0033 for ; Thu, 29 Aug 2013 23:45:32 -0400 (EDT) Message-ID: <52201539.8050003@huawei.com> Date: Fri, 30 Aug 2013 11:44:57 +0800 From: Jianguo Wu MIME-Version: 1.0 Subject: [PATCH 5/5] mm/cgroup: use N_MEMORY instead of N_HIGH_MEMORY Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Li Zefan Cc: Johannes Weiner , Michal Hocko , tj@kernel.org, laijs@cn.fujitsu.com, cgroups@vger.kernel.org, containers@lists.linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Since commit 8219fc48a(mm: node_states: introduce N_MEMORY), we introduced N_MEMORY, now N_MEMORY stands for the nodes that has any memory, and N_HIGH_MEMORY stands for the nodes that has normal or high memory. The code here need to handle with the nodes which have memory, we should use N_MEMORY instead. Signed-off-by: Xishi Qiu --- mm/page_cgroup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 6d757e3..f6f7603 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -116,7 +116,7 @@ static void *__meminit alloc_page_cgroup(size_t size, int nid) return addr; } - if (node_state(nid, N_HIGH_MEMORY)) + if (node_state(nid, N_MEMORY)) addr = vzalloc_node(size, nid); else addr = vzalloc(size); -- 1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org