diff options
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 0c7c18f78425..6f6e04c40c93 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -184,14 +184,6 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) | |||
184 | points /= 4; | 184 | points /= 4; |
185 | 185 | ||
186 | /* | 186 | /* |
187 | * If p's nodes don't overlap ours, it may still help to kill p | ||
188 | * because p may have allocated or otherwise mapped memory on | ||
189 | * this node before. However it will be less likely. | ||
190 | */ | ||
191 | if (!has_intersects_mems_allowed(p)) | ||
192 | points /= 8; | ||
193 | |||
194 | /* | ||
195 | * Adjust the score by oom_adj. | 187 | * Adjust the score by oom_adj. |
196 | */ | 188 | */ |
197 | if (oom_adj) { | 189 | if (oom_adj) { |
@@ -277,6 +269,8 @@ static struct task_struct *select_bad_process(unsigned long *ppoints, | |||
277 | continue; | 269 | continue; |
278 | if (mem && !task_in_mem_cgroup(p, mem)) | 270 | if (mem && !task_in_mem_cgroup(p, mem)) |
279 | continue; | 271 | continue; |
272 | if (!has_intersects_mems_allowed(p)) | ||
273 | continue; | ||
280 | 274 | ||
281 | /* | 275 | /* |
282 | * This task already has access to memory reserves and is | 276 | * This task already has access to memory reserves and is |