uml: stop specially protecting kernel stacks

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 11c6762a652993d97f769586bf46f2c2b3c8864d..54f31a191b8813a1bac92190cd237023c30a684d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -282,13 +282,25 @@ config CPUSETS
          Say N if unsure.
 
 config FAIR_GROUP_SCHED
-       bool "Fair group scheduler"
-       depends on EXPERIMENTAL && CONTAINERS
+       bool "Fair group CPU scheduler"
+       default y
+       depends on EXPERIMENTAL
        help
-         This option enables you to group tasks and control CPU resource
-         allocation to such groups.
+         This feature lets CPU scheduler recognize task groups and control CPU
+         bandwidth allocation to such task groups.
 
-         Say N if unsure.
+choice
+       depends on FAIR_GROUP_SCHED
+       prompt "Basis for grouping tasks"
+       default FAIR_USER_SCHED
+
+config FAIR_USER_SCHED
+       bool "user id"
+       help
+         This option will choose userid as the basis for grouping
+         tasks, thus providing equal CPU bandwidth to each user.
+
+endchoice
 
 config SYSFS_DEPRECATED
        bool "Create deprecated sysfs files"