From d8e34a349db31ab6c18b1aa6541196b92765ff47 Mon Sep 17 00:00:00 2001
From: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Tue, 31 Jul 2012 16:42:42 -0700
Subject: [PATCH] --- yaml --- r: 320783 b: refs/heads/master c:
 59b8e85c26e77d236ebdd61866ffc5e69c5f531d h: refs/heads/master i:   320781:
 9fc49e2f650b01a920d877e5a6d0b3d46dc05c16   320779:
 1c8e1d8b347beeeb9b807ba4dc8c1520f57ea20b   320775:
 1db36bc3b890ee47c66e0efc763d96bf17627487   320767:
 3d65167e220f08a59dc1cde9e617fe226e164c3b v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0aad122f5786..2070edfe1602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd07383b6bbc1418b1bdd5f295d13e600222fffa
+refs/heads/master: 59b8e85c26e77d236ebdd61866ffc5e69c5f531d
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 1940ba8e6f00..8062d45ee7f4 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -3691,9 +3691,6 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg, bool free_all)
 		ret = -EBUSY;
 		if (cgroup_task_count(cgrp) || !list_empty(&cgrp->children))
 			goto out;
-		ret = -EINTR;
-		if (signal_pending(current))
-			goto out;
 		/* This is for making all *used* pages to be on LRU. */
 		lru_add_drain_all();
 		drain_all_stock_sync(memcg);