From 98cc3402ff224d003a85c109bf3bde70c7e2683b Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Wed, 2 Nov 2011 13:38:18 -0700
Subject: [PATCH] --- yaml --- r: 273242 b: refs/heads/master c:
 715a5ee82ab3c07430f748630044354132add5ad h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2900a19bc4c2..50e2363931a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0ff4b8540a5c158b8e5bafb7d767298b67b0b92
+refs/heads/master: 715a5ee82ab3c07430f748630044354132add5ad
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 9e38abdbfd95..c02d87028b9f 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -1898,7 +1898,7 @@ bool mem_cgroup_handle_oom(struct mem_cgroup *memcg, gfp_t mask)
 	if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current))
 		return false;
 	/* Give chance to dying process */
-	schedule_timeout(1);
+	schedule_timeout_uninterruptible(1);
 	return true;
 }