aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds2014-01-21 19:51:34 -0600
committerLinus Torvalds2014-01-21 19:51:34 -0600
commitf075e0f6993f41c72dbb1d3e7a2d7740f14e89e2 (patch)
treea25b464a67fffc6f43940e0e85e2735a48bb1ad7 /init
parent5cb7398caf69e3943df78435a19a8a77fe8b9463 (diff)
parentdd4b0a4676907481256d16d5de0851b315a6f22c (diff)
downloadlinux-phy-f075e0f6993f41c72dbb1d3e7a2d7740f14e89e2.tar.gz
linux-phy-f075e0f6993f41c72dbb1d3e7a2d7740f14e89e2.tar.xz
linux-phy-f075e0f6993f41c72dbb1d3e7a2d7740f14e89e2.zip
Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: "The bulk of changes are cleanups and preparations for the upcoming kernfs conversion. - cgroup_event mechanism which is and will be used only by memcg is moved to memcg. - pidlist handling is updated so that it can be served by seq_file. Also, the list is not sorted if sane_behavior. cgroup documentation explicitly states that the file is not sorted but it has been for quite some time. - All cgroup file handling now happens on top of seq_file. This is to prepare for kernfs conversion. In addition, all operations are restructured so that they map 1-1 to kernfs operations. - Other cleanups and low-pri fixes" * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (40 commits) cgroup: trivial style updates cgroup: remove stray references to css_id doc: cgroups: Fix typo in doc/cgroups cgroup: fix fail path in cgroup_load_subsys() cgroup: fix missing unlock on error in cgroup_load_subsys() cgroup: remove for_each_root_subsys() cgroup: implement for_each_css() cgroup: factor out cgroup_subsys_state creation into create_css() cgroup: combine css handling loops in cgroup_create() cgroup: reorder operations in cgroup_create() cgroup: make for_each_subsys() useable under cgroup_root_mutex cgroup: css iterations and css_from_dir() are safe under cgroup_mutex cgroup: unify pidlist and other file handling cgroup: replace cftype->read_seq_string() with cftype->seq_show() cgroup: attach cgroup_open_file to all cgroup files cgroup: generalize cgroup_pidlist_open_file cgroup: unify read path so that seq_file is always used cgroup: unify cgroup_write_X64() and cgroup_write_string() cgroup: remove cftype->read(), ->read_map() and ->write() hugetlb_cgroup: convert away from cftype->read() ...
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 5236dc562a36..8d402e33b7fc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -854,7 +854,6 @@ config NUMA_BALANCING
854 854
855menuconfig CGROUPS 855menuconfig CGROUPS
856 boolean "Control Group support" 856 boolean "Control Group support"
857 depends on EVENTFD
858 help 857 help
859 This option adds support for grouping sets of processes together, for 858 This option adds support for grouping sets of processes together, for
860 use with process control subsystems such as Cpusets, CFS, memory 859 use with process control subsystems such as Cpusets, CFS, memory
@@ -921,6 +920,7 @@ config MEMCG
921 bool "Memory Resource Controller for Control Groups" 920 bool "Memory Resource Controller for Control Groups"
922 depends on RESOURCE_COUNTERS 921 depends on RESOURCE_COUNTERS
923 select MM_OWNER 922 select MM_OWNER
923 select EVENTFD
924 help 924 help
925 Provides a memory resource controller that manages both anonymous 925 Provides a memory resource controller that manages both anonymous
926 memory and page cache. (See Documentation/cgroups/memory.txt) 926 memory and page cache. (See Documentation/cgroups/memory.txt)
@@ -1160,7 +1160,6 @@ config UIDGID_STRICT_TYPE_CHECKS
1160 1160
1161config SCHED_AUTOGROUP 1161config SCHED_AUTOGROUP
1162 bool "Automatic process group scheduling" 1162 bool "Automatic process group scheduling"
1163 select EVENTFD
1164 select CGROUPS 1163 select CGROUPS
1165 select CGROUP_SCHED 1164 select CGROUP_SCHED
1166 select FAIR_GROUP_SCHED 1165 select FAIR_GROUP_SCHED