aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/oom_kill.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 709aedfaa014..7c0dc414dba8 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -256,14 +256,11 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
256 for_each_process(p) { 256 for_each_process(p) {
257 unsigned long points; 257 unsigned long points;
258 258
259 /* 259 /* skip tasks that have already released their mm */
260 * skip kernel threads and tasks which have already released
261 * their mm.
262 */
263 if (!p->mm) 260 if (!p->mm)
264 continue; 261 continue;
265 /* skip the init task */ 262 /* skip the init task and kthreads */
266 if (is_global_init(p)) 263 if (is_global_init(p) || (p->flags & PF_KTHREAD))
267 continue; 264 continue;
268 if (mem && !task_in_mem_cgroup(p, mem)) 265 if (mem && !task_in_mem_cgroup(p, mem))
269 continue; 266 continue;