Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 17 insertions, 6 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 824d48cb67bf..dcef8b55011a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -311,25 +311,36 @@ config CPUSETS
 
           Say N if unsure.
 
-config FAIR_GROUP_SCHED
-        bool "Fair group CPU scheduler"
+config GROUP_SCHED
+        bool "Group CPU scheduler"
         default y
         help
           This feature lets CPU scheduler recognize task groups and control CPU
           bandwidth allocation to such task groups.
 
+config FAIR_GROUP_SCHED
+        bool "Group scheduling for SCHED_OTHER"
+        depends on GROUP_SCHED
+        default y
+
+config RT_GROUP_SCHED
+        bool "Group scheduling for SCHED_RR/FIFO"
+        depends on EXPERIMENTAL
+        depends on GROUP_SCHED
+        default n
+
 choice
-        depends on FAIR_GROUP_SCHED
+        depends on GROUP_SCHED
         prompt "Basis for grouping tasks"
-        default FAIR_USER_SCHED
+        default USER_SCHED
 
-config FAIR_USER_SCHED
+config 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.
 
-config FAIR_CGROUP_SCHED
+config CGROUP_SCHED
         bool "Control groups"
         depends on CGROUPS
         help