From e6e5ff6e805ff87220d7af41b06b4500813c7399 Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Wed, 27 Feb 2013 17:03:20 -0800
Subject: [PATCH] --- yaml --- r: 359293 b: refs/heads/master c:
 80d26af89a7249aa5475467000322163c60cdd72 h: refs/heads/master i:   359291:
 a72f3f0d4f35eec4e6435fec4832d1b942adbbde v: v3

---
 [refs]              | 2 +-
 trunk/kernel/exit.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 12f24e3bb767..5f6db82a7f21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aa9707099c4b25700940eb3d016f16c4434360d
+refs/heads/master: 80d26af89a7249aa5475467000322163c60cdd72
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index aaf97c122e8a..51e485ca9935 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -20,6 +20,7 @@
 #include <linux/tsacct_kern.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
+#include <linux/freezer.h>
 #include <linux/binfmts.h>
 #include <linux/nsproxy.h>
 #include <linux/pid_namespace.h>
@@ -31,7 +32,6 @@
 #include <linux/mempolicy.h>
 #include <linux/taskstats_kern.h>
 #include <linux/delayacct.h>
-#include <linux/freezer.h>
 #include <linux/cgroup.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
@@ -485,7 +485,7 @@ static void exit_mm(struct task_struct * tsk)
 			set_task_state(tsk, TASK_UNINTERRUPTIBLE);
 			if (!self.task) /* see coredump_finish() */
 				break;
-			schedule();
+			freezable_schedule();
 		}
 		__set_task_state(tsk, TASK_RUNNING);
 		down_read(&mm->mmap_sem);