openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

oom: use N_MEMORY instead N_HIGH_MEMORY 

N_HIGH_MEMORY stands for the nodes that has normal or high memory.
N_MEMORY stands for the nodes that has any memory.

The code here need to handle with the nodes which have memory, we should
use N_MEMORY instead.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Hillf Danton <dhillf@gmail.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Lin Feng <linfeng@cn.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Lai Jiangshan 2012-12-12 13:51:28 -08:00 committed by Linus Torvalds
parent 31aaea4aa1
commit bd3a66c1cd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/oom_kill.c
View File

@ -215,7 +215,7 @@ static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
* the page allocator means a mempolicy is in effect. Cpuset policy * the page allocator means a mempolicy is in effect. Cpuset policy
* is enforced in get_page_from_freelist(). * is enforced in get_page_from_freelist().
*/ */
if (nodemask && !nodes_subset(node_states[N_HIGH_MEMORY], *nodemask)) { if (nodemask && !nodes_subset(node_states[N_MEMORY], *nodemask)) {
*totalpages = total_swap_pages; *totalpages = total_swap_pages;
for_each_node_mask(nid, *nodemask) for_each_node_mask(nid, *nodemask)
*totalpages += node_spanned_pages(nid); *totalpages += node_spanned_pages(nid);