aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/oom_kill.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index f694ef0d9f9a..d503e9ce1c7b 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -281,14 +281,9 @@ enum oom_scan_t oom_scan_process_thread(struct task_struct *task,
281 if (oom_task_origin(task)) 281 if (oom_task_origin(task))
282 return OOM_SCAN_SELECT; 282 return OOM_SCAN_SELECT;
283 283
284 if (task_will_free_mem(task) && !force_kill) { 284 if (task_will_free_mem(task) && !force_kill)
285 /* 285 return OOM_SCAN_ABORT;
286 * If this task is not being ptraced on exit, then wait for it 286
287 * to finish before killing some other task unnecessarily.
288 */
289 if (!(task->group_leader->ptrace & PT_TRACE_EXIT))
290 return OOM_SCAN_ABORT;
291 }
292 return OOM_SCAN_OK; 287 return OOM_SCAN_OK;
293} 288}
294 289