From 322b5fbdcc8321bb907c3b089fd8fb4c754cd901 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Mon, 9 Aug 2010 17:18:44 -0700
Subject: [PATCH] --- yaml --- r: 207203 b: refs/heads/master c:
 b52279406e77be711c068f9a8e970ea6471e089c h: refs/heads/master i:   207201:
 d8d287e082658322d6bf0e178536b3061260d9c2   207199:
 b8e849a3885753eb501d242d18a6644156991207 v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e7d3753e9f6..8e4b6af4a951 100644
--- 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
index 7c0dc414dba8..0a6e466155d2 100644
--- 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);