2 files changed, 11 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a29a688c47d3..51b3d14f44f1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -270,6 +270,14 @@ config LOG_BUF_SHIFT
                      13 =>  8 KB
                      12 =>  4 KB
 
+config CGROUPS
+        bool "Control Group support"
+        help
+          This option will let you use process cgroup subsystems
+          such as Cpusets
+
+          Say N if unsure.
+
 config CPUSETS
         bool "Cpuset support"
         depends on SMP
diff --git a/init/main.c b/init/main.c
index 9def935ab13a..0dd0e7a1f632 100644
--- a/init/main.c
+++ b/init/main.c
@@ -39,6 +39,7 @@
 #include <linux/writeback.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
+#include <linux/cgroup.h>
 #include <linux/efi.h>
 #include <linux/tick.h>
 #include <linux/interrupt.h>
@@ -523,6 +524,7 @@ asmlinkage void __init start_kernel(void)
          */
         unwind_init();
         lockdep_init();
+        cgroup_init_early();
 
         local_irq_disable();
         early_boot_irqs_off();
@@ -640,6 +642,7 @@ asmlinkage void __init start_kernel(void)
 #ifdef CONFIG_PROC_FS
         proc_root_init();
 #endif
+        cgroup_init();
         cpuset_init();
         taskstats_init_early();
         delayacct_init();