1 files changed, 0 insertions, 7 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a5e0417b4f9a..6144a8e7283f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4857,11 +4857,6 @@ static inline bool memcg_has_children(struct mem_cgroup *memcg)
 static int mem_cgroup_force_empty(struct mem_cgroup *memcg)
 {
         int nr_retries = MEM_CGROUP_RECLAIM_RETRIES;
-        struct cgroup *cgrp = memcg->css.cgroup;
-
-        /* returns EBUSY if there is a task or if we come here twice. */
-        if (cgroup_has_tasks(cgrp) || !list_empty(&cgrp->children))
-                return -EBUSY;
 
         /* we call try-to-free pages for make this cgroup empty */
         lru_add_drain_all();
@@ -4881,8 +4876,6 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg)
                 }
 
         }
-        lru_add_drain();
-        mem_cgroup_reparent_charges(memcg);
 
         return 0;
 }