diff options
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 7d056843fa2d..4f815b06ac1b 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -129,6 +129,14 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) | |||
129 | points /= 4; | 129 | points /= 4; |
130 | 130 | ||
131 | /* | 131 | /* |
132 | * If p's nodes don't overlap ours, it may still help to kill p | ||
133 | * because p may have allocated or otherwise mapped memory on | ||
134 | * this node before. However it will be less likely. | ||
135 | */ | ||
136 | if (!cpuset_excl_nodes_overlap(p)) | ||
137 | points /= 8; | ||
138 | |||
139 | /* | ||
132 | * Adjust the score by oomkilladj. | 140 | * Adjust the score by oomkilladj. |
133 | */ | 141 | */ |
134 | if (p->oomkilladj) { | 142 | if (p->oomkilladj) { |
@@ -198,9 +206,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) | |||
198 | continue; | 206 | continue; |
199 | if (p->oomkilladj == OOM_DISABLE) | 207 | if (p->oomkilladj == OOM_DISABLE) |
200 | continue; | 208 | continue; |
201 | /* If p's nodes don't overlap ours, it won't help to kill p. */ | ||
202 | if (!cpuset_excl_nodes_overlap(p)) | ||
203 | continue; | ||
204 | 209 | ||
205 | /* | 210 | /* |
206 | * This is in the process of releasing memory so wait for it | 211 | * This is in the process of releasing memory so wait for it |