From 0d0fd1ccacd42531d7dee83c678b320f0aa6d36b Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Wed, 12 Dec 2012 13:51:28 -0800 Subject: [PATCH] --- yaml --- r: 343318 b: refs/heads/master c: bd3a66c1cdf31274489cc1b5ace879695a5a1797 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7af688fd5fc7..ff4c1af2aa10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31aaea4aa1b267de52a44a72fd75990c79a9a433 +refs/heads/master: bd3a66c1cdf31274489cc1b5ace879695a5a1797 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 18f1ae2b45de..fe36205a7f8a 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -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);