---

yaml --- r: 35604 b: refs/heads/master c: 4a3ede1 h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · ffa78a1 · ffa78a1
1 parent 5b128f2
commit ffa78a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50ec3bbffbe8a96347c54832d48110a5bc9e9ff8
+refs/heads/master: 4a3ede107e422a0c53d28024b0aa902ca22a8768
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -204,8 +204,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
 		/* skip the init task with pid == 1 */
 		if (p->pid == 1)
 			continue;
-		if (p->oomkilladj == OOM_DISABLE)
-			continue;
 
 		/*
 		 * This is in the process of releasing memory so wait for it
@@ -230,6 +228,8 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
 			}
 			return ERR_PTR(-1UL);
 		}
+		if (p->oomkilladj == OOM_DISABLE)
+			continue;
 		if (p->flags & PF_SWAPOFF)
 			return p;