summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-09-13 20:44:30 +0200
committerDaniel Mack <github@zonque.org>2015-09-13 20:44:30 +0200
commit5669ef3644e3044036eeaaf6bb4b1a6a7e63130c (patch)
tree1f2f6f436e6070aeea41960ed91fee8705d2aac3 /man
parent2d0fd6e1c5bbaddef56ecf0fc8c59478fb9ba822 (diff)
parente7ab4d1ac9f8d99eecd5e2d22eb482a1fb0fbf23 (diff)
Merge pull request #1251 from poettering/cgroups-cleanup
cgroups cleanup + other fixes
Diffstat (limited to 'man')
-rw-r--r--man/systemd.resource-control.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 6b9329bbee..98f4d75ddb 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -118,10 +118,11 @@
<listitem>
<para>Assign the specified CPU time share weight to the
- processes executed. Those options take an integer value and
+ processes executed. These options take an integer value and
control the <literal>cpu.shares</literal> control group
- attribute, which defaults to 1024. For details about this
- control group attribute, see <ulink
+ attribute. The allowed range is 2 to 262144. Defaults to
+ 1024. For details about this control group attribute, see
+ <ulink
url="https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt">sched-design-CFS.txt</ulink>.
The available CPU time is split up among all units within
one slice relative to their CPU time share weight.</para>
@@ -258,7 +259,7 @@
the executed processes. Takes a single weight value (between
10 and 1000) to set the default block IO weight. This controls
the <literal>blkio.weight</literal> control group attribute,
- which defaults to 1000. For details about this control group
+ which defaults to 500. For details about this control group
attribute, see <ulink
url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.
The available IO bandwidth is split up among all units within