diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-11-19 14:15:42 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-11-19 14:15:42 +0100 |
| commit | c12ad58c413272092f080a6c383e3862d787d388 (patch) | |
| tree | 2076a720ebba1a2e39fa429877e9e8e1ce50a2c4 /man/systemd.resource-control.xml | |
| parent | a6fabe384d8b2fc880c3649b4c0e7bda357fb91b (diff) | |
| download | systemd-c12ad58c413272092f080a6c383e3862d787d388.tar.gz | |
man: remove note about CPU controller being unmerged
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d5936344f30aba0f6ddb92b030cb6a05168efe6
In principle we shouldn't merge this until after 4.15 is released, but the
chances of a revert upstream are low, and in that unlikely scenario we can just
revert this patch, it's a trivial documentation update after all.
Diffstat (limited to 'man/systemd.resource-control.xml')
| -rw-r--r-- | man/systemd.resource-control.xml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 9bf2d7e774..72130672cb 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -120,10 +120,6 @@ <varlistentry> <term><option>CPU</option></term> <listitem> - <para>Due to the lack of consensus in the kernel community, the CPU controller support on the unified - control group hierarchy requires out-of-tree kernel patches. See <ulink - url="https://git.kernel.org/cgit/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu">cgroup-v2-cpu.txt</ulink>.</para> - <para><varname>CPUWeight=</varname> and <varname>StartupCPUWeight=</varname> replace <varname>CPUShares=</varname> and <varname>StartupCPUShares=</varname>, respectively.</para> @@ -142,7 +138,7 @@ <varlistentry> <term><option>IO</option></term> <listitem> - <para><varname>IO</varname> prefixed settings are superset of and replace <varname>BlockIO</varname> + <para><varname>IO</varname> prefixed settings are a superset of and replace <varname>BlockIO</varname> prefixed ones. On unified hierarchy, IO resource control also applies to buffered writes.</para> </listitem> </varlistentry> |