1 files changed, 85 insertions, 57 deletions

diff --git a/init/Kconfig b/init/Kconfig
index e7893b1d3e42..a724a149bf3f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -271,59 +271,6 @@ 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 CGROUP_DEBUG
-        bool "Example debug cgroup subsystem"
-        depends on CGROUPS
-        default n
-        help
-          This option enables a simple cgroup subsystem that
-          exports useful debugging information about the cgroups
-          framework
-
-          Say N if unsure
-
-config CGROUP_NS
-        bool "Namespace cgroup subsystem"
-        depends on CGROUPS
-        help
-          Provides a simple namespace cgroup subsystem to
-          provide hierarchical naming of sets of namespaces,
-          for instance virtual servers and checkpoint/restart
-          jobs.
-
-config CGROUP_FREEZER
-        bool "control group freezer subsystem"
-        depends on CGROUPS
-        help
-          Provides a way to freeze and unfreeze all tasks in a
-          cgroup.
-
-config CGROUP_DEVICE
-        bool "Device controller for cgroups"
-        depends on CGROUPS && EXPERIMENTAL
-        help
-          Provides a cgroup implementing whitelists for devices which
-          a process in the cgroup can mknod or open.
-
-config CPUSETS
-        bool "Cpuset support"
-        depends on SMP && CGROUPS
-        help
-          This option will let you create and manage CPUSETs which
-          allow dynamically partitioning a system into sets of CPUs and
-          Memory Nodes and assigning tasks to run only within those sets.
-          This is primarily useful on large SMP or NUMA systems.
-
-          Say N if unsure.
-
 #
 # Architectures with an unreliable sched_clock() should select this:
 #
@@ -337,6 +284,8 @@ config GROUP_SCHED
         help
           This feature lets CPU scheduler recognize task groups and control CPU
           bandwidth allocation to such task groups.
+          In order to create a group from arbitrary set of processes, use
+          CONFIG_CGROUPS. (See Control Group support.)
 
 config FAIR_GROUP_SCHED
         bool "Group scheduling for SCHED_OTHER"
@@ -379,6 +328,66 @@ config CGROUP_SCHED
 
 endchoice
 
+menu "Control Group support"
+config CGROUPS
+        bool "Control Group support"
+        help
+          This option add support for grouping sets of processes together, for
+          use with process control subsystems such as Cpusets, CFS, memory
+          controls or device isolation.
+          See
+                - Documentation/cpusets.txt     (Cpusets)
+                - Documentation/scheduler/sched-design-CFS.txt  (CFS)
+                - Documentation/cgroups/ (features for grouping, isolation)
+                - Documentation/controllers/ (features for resource control)
+
+          Say N if unsure.
+
+config CGROUP_DEBUG
+        bool "Example debug cgroup subsystem"
+        depends on CGROUPS
+        default n
+        help
+          This option enables a simple cgroup subsystem that
+          exports useful debugging information about the cgroups
+          framework
+
+          Say N if unsure
+
+config CGROUP_NS
+        bool "Namespace cgroup subsystem"
+        depends on CGROUPS
+        help
+          Provides a simple namespace cgroup subsystem to
+          provide hierarchical naming of sets of namespaces,
+          for instance virtual servers and checkpoint/restart
+          jobs.
+
+config CGROUP_FREEZER
+        bool "control group freezer subsystem"
+        depends on CGROUPS
+        help
+          Provides a way to freeze and unfreeze all tasks in a
+          cgroup.
+
+config CGROUP_DEVICE
+        bool "Device controller for cgroups"
+        depends on CGROUPS && EXPERIMENTAL
+        help
+          Provides a cgroup implementing whitelists for devices which
+          a process in the cgroup can mknod or open.
+
+config CPUSETS
+        bool "Cpuset support"
+        depends on SMP && CGROUPS
+        help
+          This option will let you create and manage CPUSETs which
+          allow dynamically partitioning a system into sets of CPUs and
+          Memory Nodes and assigning tasks to run only within those sets.
+          This is primarily useful on large SMP or NUMA systems.
+
+          Say N if unsure.
+
 config CGROUP_CPUACCT
         bool "Simple CPU accounting cgroup subsystem"
         depends on CGROUPS
@@ -393,9 +402,6 @@ config RESOURCE_COUNTERS
           infrastructure that works with cgroups
         depends on CGROUPS
 
-config MM_OWNER
-        bool
-
 config CGROUP_MEM_RES_CTLR
         bool "Memory Resource Controller for Control Groups"
         depends on CGROUPS && RESOURCE_COUNTERS
@@ -414,11 +420,33 @@ config CGROUP_MEM_RES_CTLR
           sure you need the memory resource controller. Even when you enable
           this, you can set "cgroup_disable=memory" at your boot option to
           disable memory resource controller and you can avoid overheads.
-          (and lose benefits of memory resource contoller)
+          (and lose benefits of memory resource controller)
 
           This config option also selects MM_OWNER config option, which
           could in turn add some fork/exit overhead.
 
+config MM_OWNER
+        bool
+
+config CGROUP_MEM_RES_CTLR_SWAP
+        bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
+        depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
+        help
+          Add swap management feature to memory resource controller. When you
+          enable this, you can limit mem+swap usage per cgroup. In other words,
+          when you disable this, memory resource controller has no cares to
+          usage of swap...a process can exhaust all of the swap. This extension
+          is useful when you want to avoid exhaustion swap but this itself
+          adds more overheads and consumes memory for remembering information.
+          Especially if you use 32bit system or small memory system, please
+          be careful about enabling this. When memory resource controller
+          is disabled by boot option, this will be automatically disabled and
+          there will be no overhead from this. Even when you set this config=y,
+          if boot option "noswapaccount" is set, swap will not be accounted.
+
+
+endmenu
+
 config SYSFS_DEPRECATED
         bool