summaryrefslogtreecommitdiff
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
authorNikanth Karthikesan <knikanth@suse.de>2009-05-28 14:34:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-29 08:40:03 -0700
commit46f7e602fb32e02145ef14f8c0ca6d399f0a96b9 (patch)
tree3db67ceec30ffc1ababad1d79c11ba8a61fa037c /mm/memcontrol.c
parentf83a275dbc5ca1721143698e844243fcadfabf6a (diff)
downloadlinux-3.10-46f7e602fb32e02145ef14f8c0ca6d399f0a96b9.tar.gz
linux-3.10-46f7e602fb32e02145ef14f8c0ca6d399f0a96b9.tar.bz2
linux-3.10-46f7e602fb32e02145ef14f8c0ca6d399f0a96b9.zip
memcg: fix build warning and avoid checking for mem != null again and again
Fix build warning, "mem_cgroup_is_obsolete defined but not used" when CONFIG_DEBUG_VM is not set. Also avoid checking for !mem again and again. Signed-off-by: Nikanth Karthikesan <knikanth@suse.de> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 4a747a27a22..78eb8552818 100644
--- a/mm/memcontrol.c
+++ b/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;