From c77cbb051c677aa7688b3ae76b5227f386c88c2f Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Thu, 28 May 2009 14:34:41 -0700
Subject: [PATCH] --- yaml --- r: 145346 b: refs/heads/master c:
 46f7e602fb32e02145ef14f8c0ca6d399f0a96b9 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/mm/memcontrol.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index bccd5f69901d..07f6550ddabe 100644
--- 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
index 4a747a27a22f..78eb8552818b 100644
--- 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;