summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-30 21:50:22 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-30 22:26:16 +0200
commit618234a5258768359cb1086b152c5f08aaf89754 (patch)
tree2fb6f9820ff043bc5a6a615d343bcfebf6a6cfad /src/core
parent94d75d6423f16f1fb66d214cb640ae3a114c5c58 (diff)
basic: split out cpu set specific APIs into cpu-set-util.[ch]
Diffstat (limited to 'src/core')
-rw-r--r--src/core/load-fragment.c7
-rw-r--r--src/core/machine-id-setup.c19
-rw-r--r--src/core/main.c1
3 files changed, 15 insertions, 12 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 2d73ef49c8..fc2755cb92 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -24,13 +24,13 @@
#include <fcntl.h>
#include <linux/fs.h>
#include <linux/oom.h>
+#ifdef HAVE_SECCOMP
+#include <seccomp.h>
+#endif
#include <sched.h>
#include <string.h>
#include <sys/resource.h>
#include <sys/stat.h>
-#ifdef HAVE_SECCOMP
-#include <seccomp.h>
-#endif
#include "af-list.h"
#include "bus-error.h"
@@ -39,6 +39,7 @@
#include "cap-list.h"
#include "cgroup.h"
#include "conf-parser.h"
+#include "cpu-set-util.h"
#include "env-util.h"
#include "errno-list.h"
#include "ioprio.h"
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index 8f682c6d10..363ffaaf05 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -19,24 +19,25 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <unistd.h>
-#include <stdio.h>
#include <errno.h>
-#include <string.h>
#include <fcntl.h>
+#include <sched.h>
+#include <stdio.h>
+#include <string.h>
#include <sys/mount.h>
+#include <unistd.h>
-#include "systemd/sd-id128.h"
+#include "sd-id128.h"
-#include "machine-id-setup.h"
+#include "fileio.h"
+#include "log.h"
#include "macro.h"
-#include "util.h"
#include "mkdir.h"
-#include "log.h"
-#include "virt.h"
-#include "fileio.h"
#include "path-util.h"
#include "process-util.h"
+#include "util.h"
+#include "virt.h"
+#include "machine-id-setup.h"
static int shorten_uuid(char destination[34], const char source[36]) {
unsigned i, j;
diff --git a/src/core/main.c b/src/core/main.c
index ee6576fb35..2406832694 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -47,6 +47,7 @@
#include "capability.h"
#include "clock-util.h"
#include "conf-parser.h"
+#include "cpu-set-util.h"
#include "dbus-manager.h"
#include "def.h"
#include "env-util.h"