Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
  sched: Fix SCHED_MC regression caused by change in sched cpu_power
  sched: Don't use possibly stale sched_class
  kthread, sched: Remove reference to kthread_create_on_cpu
  sched: cpuacct: Use bigger percpu counter batch values for stats counters
  percpu_counter: Make __percpu_counter_add an inline function on UP
  sched: Remove member rt_se from struct rt_rq
  sched: Change usage of rt_rq->rt_se to rt_rq->tg->rt_se[cpu]
  sched: Remove unused update_shares_locked()
  sched: Use for_each_bit
  sched: Queue a deboosted task to the head of the RT prio queue
  sched: Implement head queueing for sched_rt
  sched: Extend enqueue_task to allow head queueing
  sched: Remove USER_SCHED
  sched: Fix the place where group powers are updated
  sched: Assume *balance is valid
  sched: Remove load_balance_newidle()
  sched: Unify load_balance{,_newidle}()
  sched: Add a lock break for PREEMPT=y
  sched: Remove from fwd decls
  sched: Remove rq_iterator from move_one_task
  ...

Fix up trivial conflicts in kernel/sched.c

1 files changed, 30 insertions, 51 deletions

diff --git a/init/Kconfig b/init/Kconfig
index c6d95f8ea055..089a230e5652 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -461,57 +461,6 @@ config LOG_BUF_SHIFT
 config HAVE_UNSTABLE_SCHED_CLOCK
         bool
 
-config GROUP_SCHED
-        bool "Group CPU scheduler"
-        depends on EXPERIMENTAL
-        default n
-        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"
-        depends on GROUP_SCHED
-        default GROUP_SCHED
-
-config RT_GROUP_SCHED
-        bool "Group scheduling for SCHED_RR/FIFO"
-        depends on EXPERIMENTAL
-        depends on GROUP_SCHED
-        default n
-        help
-          This feature lets you explicitly allocate real CPU bandwidth
-          to users or control groups (depending on the "Basis for grouping tasks"
-          setting below. If enabled, it will also make it impossible to
-          schedule realtime tasks for non-root users until you allocate
-          realtime bandwidth for them.
-          See Documentation/scheduler/sched-rt-group.txt for more information.
-
-choice
-        depends on GROUP_SCHED
-        prompt "Basis for grouping tasks"
-        default 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 CGROUP_SCHED
-        bool "Control groups"
-        depends on CGROUPS
-        help
-          This option allows you to create arbitrary task groups
-          using the "cgroup" pseudo filesystem and control
-          the cpu bandwidth allocated to each such task group.
-          Refer to Documentation/cgroups/cgroups.txt for more
-          information on "cgroup" pseudo filesystem.
-
-endchoice
-
 menuconfig CGROUPS
         boolean "Control Group support"
         help
@@ -632,6 +581,36 @@ config CGROUP_MEM_RES_CTLR_SWAP
           Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
           size is 4096bytes, 512k per 1Gbytes of swap.
 
+menuconfig CGROUP_SCHED
+        bool "Group CPU scheduler"
+        depends on EXPERIMENTAL && CGROUPS
+        default n
+        help
+          This feature lets CPU scheduler recognize task groups and control CPU
+          bandwidth allocation to such task groups. It uses cgroups to group
+          tasks.
+
+if CGROUP_SCHED
+config FAIR_GROUP_SCHED
+        bool "Group scheduling for SCHED_OTHER"
+        depends on CGROUP_SCHED
+        default CGROUP_SCHED
+
+config RT_GROUP_SCHED
+        bool "Group scheduling for SCHED_RR/FIFO"
+        depends on EXPERIMENTAL
+        depends on CGROUP_SCHED
+        default n
+        help
+          This feature lets you explicitly allocate real CPU bandwidth
+          to users or control groups (depending on the "Basis for grouping tasks"
+          setting below. If enabled, it will also make it impossible to
+          schedule realtime tasks for non-root users until you allocate
+          realtime bandwidth for them.
+          See Documentation/scheduler/sched-rt-group.txt for more information.
+
+endif #CGROUP_SCHED
+
 endif # CGROUPS
 
 config MM_OWNER