-
- Downloads
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits) cgroup: fix to allow mounting a hierarchy by name cgroup: move assignement out of condition in cgroup_attach_proc() cgroup: Remove task_lock() from cgroup_post_fork() cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end() cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static cgroup: only need to check oldcgrp==newgrp once cgroup: remove redundant get/put of task struct cgroup: remove redundant get/put of old css_set from migrate cgroup: Remove unnecessary task_lock before fetching css_set on migration cgroup: Drop task_lock(parent) on cgroup_fork() cgroups: remove redundant get/put of css_set from css_set_check_fetched() resource cgroups: remove bogus cast cgroup: kill subsys->can_attach_task(), pre_attach() and attach_task() cgroup, cpuset: don't use ss->pre_attach() cgroup: don't use subsys->can_attach_task() or ->attach_task() cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_attach() and attach() cgroup: improve old cgroup handling in cgroup_attach_proc() cgroup: always lock threadgroup during migration threadgroup: extend threadgroup_lock() to cover exit and exec threadgroup: rename signal->threadgroup_fork_lock to ->group_rwsem ... Fix up conflict in kernel/cgroup.c due to commit e0197aae: "cgroups: fix a css_set not found bug in cgroup_attach_proc" that already mentioned that the bug is fixed (differently) in Tejun's cgroup patchset. This one, in other words.
Showing
- Documentation/cgroups/cgroups.txt 21 additions, 30 deletionsDocumentation/cgroups/cgroups.txt
- block/blk-cgroup.c 28 additions, 17 deletionsblock/blk-cgroup.c
- include/linux/cgroup.h 25 additions, 6 deletionsinclude/linux/cgroup.h
- include/linux/init_task.h 4 additions, 5 deletionsinclude/linux/init_task.h
- include/linux/sched.h 54 additions, 19 deletionsinclude/linux/sched.h
- kernel/cgroup.c 231 additions, 170 deletionskernel/cgroup.c
- kernel/cgroup_freezer.c 5 additions, 11 deletionskernel/cgroup_freezer.c
- kernel/cpuset.c 48 additions, 57 deletionskernel/cpuset.c
- kernel/events/core.c 8 additions, 5 deletionskernel/events/core.c
- kernel/fork.c 4 additions, 4 deletionskernel/fork.c
- kernel/res_counter.c 1 addition, 2 deletionskernel/res_counter.c
- kernel/sched/core.c 19 additions, 12 deletionskernel/sched/core.c
- kernel/signal.c 10 additions, 0 deletionskernel/signal.c
- mm/memcontrol.c 8 additions, 8 deletionsmm/memcontrol.c
- security/device_cgroup.c 4 additions, 3 deletionssecurity/device_cgroup.c
Loading
Please register or sign in to comment