summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2011-01-25 15:07:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-26 10:50:03 +1000
commit3d37c4a9199920964ffdfaec6335d93b9dcf9ca5 (patch)
treeee37989687d869817aa870a7fb4c405b7907c030 /mm
parent01c88e2d6b7330c0cc5867fe2297e7d826e1337d (diff)
downloadop-kernel-dev-3d37c4a9199920964ffdfaec6335d93b9dcf9ca5.zip
op-kernel-dev-3d37c4a9199920964ffdfaec6335d93b9dcf9ca5.tar.gz
memcg: bugfix check mem_cgroup_disabled() at split fixup
mem_cgroup_disabled() should be checked at splitting. If disabled, no heavy work is necesary. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Reviewed-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Balbir Singh <balbir@in.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1eb1a04..8ab1d42 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2145,6 +2145,8 @@ void mem_cgroup_split_huge_fixup(struct page *head, struct page *tail)
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.
OpenPOWER on IntegriCloud