---

yaml --- r: 320783 b: refs/heads/master c: 59b8e85 h: refs/heads/master i: 320781: 9fc49e2 320779: 1c8e1d8 320775: 1db36bc 320767: 3d65167 v: v3
git-mirror · Aug 1, 2012 · d8e34a3 · d8e34a3
1 parent 6c1d9a1
commit d8e34a3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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);