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);