diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 22:50:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 22:50:04 -0400 |
| commit | bbe179f88d39274630823a0dc07d2714fd19a103 (patch) | |
| tree | f70181a660e0f859f230233643faded7d44360e5 /init | |
| parent | 4b703b1d4c46ca4a00109ca1a391943ec21991b3 (diff) | |
| parent | 8a0792ef8e01f03cb43806c6a87738bde34df713 (diff) | |
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
- threadgroup_lock got reorganized so that its users can pick the
actual locking mechanism to use. Its only user - cgroups - is
updated to use a percpu_rwsem instead of per-process rwsem.
This makes things a bit lighter on hot paths and allows cgroups to
perform and fail multi-task (a process) migrations atomically.
Multi-task migrations are used in several places including the
unified hierarchy.
- Delegation rule and documentation added to unified hierarchy. This
will likely be the last interface update from the cgroup core side
for unified hierarchy before lifting the devel mask.
- Some groundwork for the pids controller which is scheduled to be
merged in the coming devel cycle.
* 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: add delegation section to unified hierarchy documentation
cgroup: require write perm on common ancestor when moving processes on the default hierarchy
cgroup: separate out cgroup_procs_write_permission() from __cgroup_procs_write()
kernfs: make kernfs_get_inode() public
MAINTAINERS: add a cgroup core co-maintainer
cgroup: fix uninitialised iterator in for_each_subsys_which
cgroup: replace explicit ss_mask checking with for_each_subsys_which
cgroup: use bitmask to filter for_each_subsys
cgroup: add seq_file forward declaration for struct cftype
cgroup: simplify threadgroup locking
sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem
sched, cgroup: reorganize threadgroup locking
cgroup: switch to unsigned long for bitmasks
cgroup: reorganize include/linux/cgroup.h
cgroup: separate out include/linux/cgroup-defs.h
cgroup: fix some comment typos
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index f0c2e681b506..7d1ffd2ae536 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -924,6 +924,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED | |||
| 924 | menuconfig CGROUPS | 924 | menuconfig CGROUPS |
| 925 | bool "Control Group support" | 925 | bool "Control Group support" |
| 926 | select KERNFS | 926 | select KERNFS |
| 927 | select PERCPU_RWSEM | ||
| 927 | help | 928 | help |
| 928 | This option adds support for grouping sets of processes together, for | 929 | This option adds support for grouping sets of processes together, for |
| 929 | use with process control subsystems such as Cpusets, CFS, memory | 930 | use with process control subsystems such as Cpusets, CFS, memory |