|
 |
dd65c9 |
From 99afbf6e7fac9f33f0f96c0397c413ba360607a2 Mon Sep 17 00:00:00 2001
|
|
|
dd65c9 |
From: Filipe Brandenburger <filbranden@google.com>
|
|
|
dd65c9 |
Date: Tue, 13 Oct 2015 00:12:39 -0700
|
|
|
dd65c9 |
Subject: [PATCH] man: Update man page documentation for CPUAffinity
|
|
|
dd65c9 |
|
|
|
dd65c9 |
Document support for commas as a separator and possibility of specifying
|
|
|
dd65c9 |
ranges of CPU indices.
|
|
|
dd65c9 |
|
|
|
dd65c9 |
Tested by regenerating the manpages locally and reading them on man.
|
|
|
dd65c9 |
|
|
|
dd65c9 |
(cherry picked from commit 71b1c27a406271b71f64487ae70b58f44a4a37f0)
|
|
|
dd65c9 |
Resolves: #1493976
|
|
|
dd65c9 |
---
|
|
|
dd65c9 |
man/systemd-system.conf.xml | 6 ++++--
|
|
|
dd65c9 |
man/systemd.exec.xml | 6 ++++--
|
|
|
dd65c9 |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
dd65c9 |
|
|
|
dd65c9 |
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
|
|
Pablo Greco |
48fc63 |
index 53e8ff665a..1861bb03f0 100644
|
|
|
dd65c9 |
--- a/man/systemd-system.conf.xml
|
|
|
dd65c9 |
+++ b/man/systemd-system.conf.xml
|
|
|
dd65c9 |
@@ -117,8 +117,10 @@
|
|
|
dd65c9 |
<term><varname>CPUAffinity=</varname></term>
|
|
|
dd65c9 |
|
|
|
dd65c9 |
<listitem><para>Configures the initial CPU affinity for the
|
|
|
dd65c9 |
- init process. Takes a space-separated list of CPU
|
|
|
dd65c9 |
- indices.</para></listitem>
|
|
|
dd65c9 |
+ init process. Takes a list of CPU indices or ranges separated
|
|
|
dd65c9 |
+ by either whitespace or commas. CPU ranges are specified by
|
|
|
dd65c9 |
+ the lower and upper CPU indices separated by a
|
|
|
dd65c9 |
+ dash.</para></listitem>
|
|
|
dd65c9 |
</varlistentry>
|
|
|
dd65c9 |
|
|
|
dd65c9 |
<varlistentry>
|
|
|
dd65c9 |
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
|
|
Pablo Greco |
48fc63 |
index 508146f06c..d7503b8e81 100644
|
|
|
dd65c9 |
--- a/man/systemd.exec.xml
|
|
|
dd65c9 |
+++ b/man/systemd.exec.xml
|
|
|
dd65c9 |
@@ -211,8 +211,10 @@
|
|
|
dd65c9 |
<term><varname>CPUAffinity=</varname></term>
|
|
|
dd65c9 |
|
|
|
dd65c9 |
<listitem><para>Controls the CPU affinity of the executed
|
|
|
dd65c9 |
- processes. Takes a space-separated list of CPU indices. This
|
|
|
dd65c9 |
- option may be specified more than once in which case the
|
|
|
dd65c9 |
+ processes. Takes a list of CPU indices or ranges separated by
|
|
|
dd65c9 |
+ either whitespace or commas. CPU ranges are specified by the
|
|
|
dd65c9 |
+ lower and upper CPU indices separated by a dash.
|
|
|
dd65c9 |
+ This option may be specified more than once in which case the
|
|
|
dd65c9 |
specified CPU affinity masks are merged. If the empty string
|
|
|
dd65c9 |
is assigned, the mask is reset, all assignments prior to this
|
|
|
dd65c9 |
will have no effect. See
|