From dd3bf63618ff6831cc318742fb3587b1ef2f7eb8 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 9 Aug 2010 17:18:50 -0700
Subject: [PATCH] --- yaml --- r: 207210 b: refs/heads/master c:
 6cf86ac6f36b638459a9a6c2576d5e655d41d451 h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/mm/oom_kill.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 25f8bcd3dd5e..0929f960dc9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4358997ae38a1901498d128d6508119d9f318b36
+refs/heads/master: 6cf86ac6f36b638459a9a6c2576d5e655d41d451
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 0c7c18f78425..6f6e04c40c93 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -183,14 +183,6 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
 	if (has_capability_noaudit(p, CAP_SYS_RAWIO))
 		points /= 4;
 
-	/*
-	 * If p's nodes don't overlap ours, it may still help to kill p
-	 * because p may have allocated or otherwise mapped memory on
-	 * this node before. However it will be less likely.
-	 */
-	if (!has_intersects_mems_allowed(p))
-		points /= 8;
-
 	/*
 	 * Adjust the score by oom_adj.
 	 */
@@ -277,6 +269,8 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 			continue;
 		if (mem && !task_in_mem_cgroup(p, mem))
 			continue;
+		if (!has_intersects_mems_allowed(p))
+			continue;
 
 		/*
 		 * This task already has access to memory reserves and is