---

yaml --- r: 145346 b: refs/heads/master c: 46f7e60 h: refs/heads/master v: v3
git-mirror · May 29, 2009 · c77cbb0 · c77cbb0
1 parent c772e81
commit c77cbb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f83a275dbc5ca1721143698e844243fcadfabf6a
+refs/heads/master: 46f7e602fb32e02145ef14f8c0ca6d399f0a96b9
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -314,14 +314,6 @@ static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
 	return mem;
 }
 
-static bool mem_cgroup_is_obsolete(struct mem_cgroup *mem)
-{
-	if (!mem)
-		return true;
-	return css_is_removed(&mem->css);
-}
-
-
 /*
  * Call callback function against all cgroup under hierarchy tree.
  */
@@ -932,7 +924,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 	if (unlikely(!mem))
 		return 0;
 
-	VM_BUG_ON(!mem || mem_cgroup_is_obsolete(mem));
+	VM_BUG_ON(css_is_removed(&mem->css));
 
 	while (1) {
 		int ret;