[PATCH 2/3] memcg: bugfix check mem_cgroup_disabled() at splitfixup

From: KAMEZAWA Hiroyuki
Date: Tue Jan 25 2011 - 01:08:00 EST

From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>

mem_cgroup_disabled() should be checked at splitting.
If diabled, no heavy work is necesary.

Acked-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Reviewed-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
mm/memcontrol.c | 2 ++
1 file changed, 2 insertions(+)

Index: linux-2.6.38-rc2/mm/memcontrol.c
--- linux-2.6.38-rc2.orig/mm/memcontrol.c
+++ linux-2.6.38-rc2/mm/memcontrol.c
@@ -2145,6 +2145,8 @@ void mem_cgroup_split_huge_fixup(struct
struct page_cgroup *tail_pc = lookup_page_cgroup(tail);
unsigned long flags;

+ if (mem_cgroup_disabled())
+ return;
* We have no races with charge/uncharge but will have races with
* page state accounting.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/