4 files changed, 32 insertions, 8 deletions

diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 0fd39f2231ec..f546ad6fc028 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -99,5 +99,10 @@ static inline struct page_cgroup *lookup_page_cgroup(struct page *page)
 {
         return NULL;
 }
+
+static inline void page_cgroup_init(void)
+{
+}
+
 #endif
 #endif
diff --git a/init/main.c b/init/main.c
index 3e17a3bafe60..672ae75b2059 100644
--- a/init/main.c
+++ b/init/main.c
@@ -52,6 +52,7 @@
 #include <linux/key.h>
 #include <linux/unwind.h>
 #include <linux/buffer_head.h>
+#include <linux/page_cgroup.h>
 #include <linux/debug_locks.h>
 #include <linux/debugobjects.h>
 #include <linux/lockdep.h>
@@ -647,6 +648,7 @@ asmlinkage void __init start_kernel(void)
         vmalloc_init();
         vfs_caches_init_early();
         cpuset_init_early();
+        page_cgroup_init();
         mem_init();
         enable_debug_pagealloc();
         cpu_hotplug_init();
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d4a92b63e98e..866dcc7eeb0c 100644
--- 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();
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 78242b4d7edf..f59d797dc5a9 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -4,8 +4,10 @@
 #include <linux/bit_spinlock.h>
 #include <linux/page_cgroup.h>
 #include <linux/hash.h>
+#include <linux/slab.h>
 #include <linux/memory.h>
 #include <linux/vmalloc.h>
+#include <linux/cgroup.h>
 
 static void __meminit
 __init_page_cgroup(struct page_cgroup *pc, unsigned long pfn)
@@ -67,6 +69,9 @@ void __init page_cgroup_init(void)
 
         int nid, fail;
 
+        if (mem_cgroup_subsys.disabled)
+                return;
+
         for_each_online_node(nid)  {
                 fail = alloc_node_page_cgroup(nid);
                 if (fail)
@@ -107,9 +112,14 @@ int __meminit init_section_page_cgroup(unsigned long pfn)
         nid = page_to_nid(pfn_to_page(pfn));
 
         table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION;
-        base = kmalloc_node(table_size, GFP_KERNEL, nid);
-        if (!base)
-                base = vmalloc_node(table_size, nid);
+        if (slab_is_available()) {
+                base = kmalloc_node(table_size, GFP_KERNEL, nid);
+                if (!base)
+                        base = vmalloc_node(table_size, nid);
+        } else {
+                base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), table_size,
+                                PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
+        }
 
         if (!base) {
                 printk(KERN_ERR "page cgroup allocation failure\n");
@@ -136,11 +146,16 @@ void __free_page_cgroup(unsigned long pfn)
         if (!ms || !ms->page_cgroup)
                 return;
         base = ms->page_cgroup + pfn;
-        ms->page_cgroup = NULL;
-        if (is_vmalloc_addr(base))
+        if (is_vmalloc_addr(base)) {
                 vfree(base);
-        else
-                kfree(base);
+                ms->page_cgroup = NULL;
+        } else {
+                struct page *page = virt_to_page(base);
+                if (!PageReserved(page)) { /* Is bootmem ? */
+                        kfree(base);
+                        ms->page_cgroup = NULL;
+                }
+        }
 }
 
 int online_page_cgroup(unsigned long start_pfn,
@@ -214,6 +229,9 @@ void __init page_cgroup_init(void)
         unsigned long pfn;
         int fail = 0;
 
+        if (mem_cgroup_subsys.disabled)
+                return;
+
         for (pfn = 0; !fail && pfn < max_pfn; pfn += PAGES_PER_SECTION) {
                 if (!pfn_present(pfn))
                         continue;