---

yaml --- r: 343318 b: refs/heads/master c: bd3a66c h: refs/heads/master v: v3
git-mirror · Dec 13, 2012 · 0d0fd1c · 0d0fd1c
1 parent c38070f
commit 0d0fd1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);