aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-11 22:52:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-11 22:52:48 -0800
commitb8bf17d311c875de02550d5ce2af66588734159a (patch)
tree82d829df77f3eb506d10928fd633a8a6e5685082 /init/Kconfig
parentMerge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentsched: Fix lockup by limiting load-balance retries on lock-break (diff)
downloadlinux-dev-b8bf17d311c875de02550d5ce2af66588734159a.tar.xz
linux-dev-b8bf17d311c875de02550d5ce2af66588734159a.zip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Fix lockup by limiting load-balance retries on lock-break sched: Fix CONFIG_CGROUP_SCHED dependency sched: Remove empty #ifdefs
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index a075765d5fbe..018d206c21f7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -713,7 +713,6 @@ config CGROUP_PERF
menuconfig CGROUP_SCHED
bool "Group CPU scheduler"
- depends on EXPERIMENTAL
default n
help
This feature lets CPU scheduler recognize task groups and control CPU