diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-28 13:06:56 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-28 13:06:56 +0100 |
| commit | e3d285e6c0fb5a63e48d97f9bec1ba6d4ec132aa (patch) | |
| tree | c2afa8ccfccfa7e464792f52e871e99281597f3f /man | |
| parent | df5b3e1840a373dca1e3da5b81540b7862994ab4 (diff) | |
| parent | 71b1c27a406271b71f64487ae70b58f44a4a37f0 (diff) | |
Merge pull request #1699 from filbranden/cpuaffinity9
cpu-set-util: Support ranges in parse_cpu_set_and_warn (v4)
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 6 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 56db9ff17e..8dad0e0f59 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -109,8 +109,10 @@ <term><varname>CPUAffinity=</varname></term> <listitem><para>Configures the initial CPU affinity for the - init process. Takes a space-separated list of CPU - indices.</para></listitem> + init process. Takes a list of CPU indices or ranges separated + by either whitespace or commas. CPU ranges are specified by + the lower and upper CPU indices separated by a + dash.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index d3f56fee40..5f99fa875e 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -217,8 +217,10 @@ <term><varname>CPUAffinity=</varname></term> <listitem><para>Controls the CPU affinity of the executed - processes. Takes a space-separated list of CPU indices. This - option may be specified more than once in which case the + processes. Takes a list of CPU indices or ranges separated by + either whitespace or commas. CPU ranges are specified by the + lower and upper CPU indices separated by a dash. + This option may be specified more than once in which case the specified CPU affinity masks are merged. If the empty string is assigned, the mask is reset, all assignments prior to this will have no effect. See |