Commit bd3a66c1 authored Dec 12, 2012 by Lai Jiangshan Committed by Linus Torvalds Dec 12, 2012

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>

parent 31aaea4a

mm/oom_kill.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
		* the page allocator means a mempolicy is in effect. Cpuset policy
		* 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;
		for_each_node_mask(nid, *nodemask)
		*totalpages += node_spanned_pages(nid);