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);