---

yaml --- r: 207203 b: refs/heads/master c: b522794 h: refs/heads/master i: 207201: d8d287e 207199: b8e849a v: v3
git-mirror · Aug 10, 2010 · 322b5fb · 322b5fb
1 parent 764f9ca
commit 322b5fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 455c0e5fb03b67fa62bd12e3abe3fa484b9960c5
+refs/heads/master: b52279406e77be711c068f9a8e970ea6471e089c
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -287,7 +287,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 		 * the process of exiting and releasing its resources.
 		 * Otherwise we could get an easy OOM deadlock.
 		 */
-		if (p->flags & PF_EXITING) {
+		if ((p->flags & PF_EXITING) && p->mm) {
 			if (p != current)
 				return ERR_PTR(-1UL);