From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jianguo Wu Subject: [PATCH 5/5] mm/cgroup: use N_MEMORY instead of N_HIGH_MEMORY Date: Fri, 30 Aug 2013 11:44:57 +0800 Message-ID: <52201539.8050003@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Andrew Morton , Li Zefan Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Michal Hocko , linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, Johannes Weiner , tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.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