diff options
| author | Linus Torvalds | 2017-03-14 15:11:19 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-03-14 15:11:19 -0700 |
| commit | 352526f45387cb96671f13b003bdd5b249e509bd (patch) | |
| tree | 9f1fa71f134ebe801c98532a36ff257f2b8043a7 /Documentation | |
| parent | 6517569d4ef33fe52b0d0ce8161349a55f88dded (diff) | |
| parent | b6a6759daf55dade2b65089957832759d502acfb (diff) | |
Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo:
"Three cgroup fixes. Nothing critical:
- the pids controller could trigger suspicious RCU warning
spuriously. Fixed.
- in the debug controller, %p -> %pK to protect kernel pointer
from getting exposed.
- documentation formatting fix"
* 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroups: censor kernel pointer in debug files
cgroup/pids: remove spurious suspicious RCU usage warning
cgroup: Fix indenting in PID controller documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/cgroup-v2.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/cgroup-v2.txt b/Documentation/cgroup-v2.txt index 3b8449f8ac7e..49d7c997fa1e 100644 --- a/Documentation/cgroup-v2.txt +++ b/Documentation/cgroup-v2.txt @@ -1142,16 +1142,17 @@ used by the kernel. pids.max - A read-write single value file which exists on non-root cgroups. The - default is "max". + A read-write single value file which exists on non-root + cgroups. The default is "max". - Hard limit of number of processes. + Hard limit of number of processes. pids.current - A read-only single value file which exists on all cgroups. + A read-only single value file which exists on all cgroups. - The number of processes currently in the cgroup and its descendants. + The number of processes currently in the cgroup and its + descendants. Organisational operations are not blocked by cgroup policies, so it is possible to have pids.current > pids.max. This can be done by either |