From e41414d391e1c2dcb75b188458981d6a05f6d775 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 9 Aug 2010 17:18:49 -0700
Subject: [PATCH] --- yaml --- r: 207209 b: refs/heads/master c:
 4358997ae38a1901498d128d6508119d9f318b36 h: refs/heads/master i:   207207:
 20060597e1c1408c7dc5c44c4fee904154decd92 v: v3

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

diff --git a/[refs] b/[refs]
index f55855e264f3..25f8bcd3dd5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b98c2e402eaa1f2beec18b1bde17f74948a19db
+refs/heads/master: 4358997ae38a1901498d128d6508119d9f318b36
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 64cdacad83d9..0c7c18f78425 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -453,7 +453,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 	 * its children or threads, just set TIF_MEMDIE so it can die quickly
 	 */
 	if (p->flags & PF_EXITING) {
-		__oom_kill_task(p, 0);
+		set_tsk_thread_flag(p, TIF_MEMDIE);
 		return 0;
 	}