Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[deliverable/linux.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d4a92b63e98e1da2fa619a7272cd0db3d15f18f1..866dcc7eeb0c3da1e4c6d822ece39a3ea65dc6f9 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1088,7 +1088,6 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
        int node;
 
        if (unlikely((cont->parent) == NULL)) {
-               page_cgroup_init();
                mem = &init_mem_cgroup;
        } else {
                mem = mem_cgroup_alloc();