Skip to content

Commit

Permalink
memcg: fix build warning and avoid checking for mem != null again and…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Nikanth Karthikesan authored and torvalds committed May 29, 2009
1 parent f83a275 commit 46f7e60
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions mm/memcontrol.c
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 46f7e60

Please sign in to comment.