diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 12:50:48 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 12:50:48 +1100 |
| commit | e8972fe64e748c280af64baf7e99dd14fb715b46 (patch) | |
| tree | 2ac4d1d5458deaaa4f0dbb62c3ce1424d3f5ad5a /init | |
| parent | 33562a06578c29f0769a37f4e7db3399662896b2 (diff) | |
| parent | 51cd0751d46fc562cb31bfb58891a402e78d036c (diff) | |
Merge remote-tracking branch 'cgroup/for-next'
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4e5d96ab2034..6319b1975899 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -854,7 +854,6 @@ config NUMA_BALANCING menuconfig CGROUPS boolean "Control Group support" - depends on EVENTFD help This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory @@ -921,6 +920,7 @@ config MEMCG bool "Memory Resource Controller for Control Groups" depends on RESOURCE_COUNTERS select MM_OWNER + select EVENTFD help Provides a memory resource controller that manages both anonymous memory and page cache. (See Documentation/cgroups/memory.txt) @@ -1160,7 +1160,6 @@ config UIDGID_STRICT_TYPE_CHECKS config SCHED_AUTOGROUP bool "Automatic process group scheduling" - select EVENTFD select CGROUPS select CGROUP_SCHED select FAIR_GROUP_SCHED |