From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Jun 2025 21:16:14 +0000 (+0900)
Subject: basic: move missing_sched.h -> include/sched.h
X-Git-Tag: v258-rc1~193^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F37960%2Fhead;p=thirdparty%2Fsystemd.git

basic: move missing_sched.h -> include/sched.h
---

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index e0d313dcec4..ba544ba1e5b 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -20,7 +20,6 @@
 #include "format-table.h"
 #include "in-addr-prefix-util.h"
 #include "manager.h"
-#include "missing_sched.h"
 #include "mkdir.h"
 #include "nulstr-util.h"
 #include "parse-util.h"
diff --git a/src/basic/argv-util.c b/src/basic/argv-util.c
index ab0fe3280d4..214c4b61f9a 100644
--- a/src/basic/argv-util.c
+++ b/src/basic/argv-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sched.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
@@ -8,7 +9,6 @@
 #include "capability-util.h"
 #include "errno-util.h"
 #include "log.h"
-#include "missing_sched.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/basic/missing_sched.h b/src/basic/include/sched.h
similarity index 84%
rename from src/basic/missing_sched.h
rename to src/basic/include/sched.h
index c14162be59a..13eb8d059e6 100644
--- a/src/basic/missing_sched.h
+++ b/src/basic/include/sched.h
@@ -5,23 +5,22 @@
  * to make struct sched_attr being defined.
  * Note, this must be included before sched.h, otherwise the headers conflict with each other. */
 #include <linux/sched/types.h>
-#include <sched.h>       /* IWYU pragma: export */
 
-#include "forward.h"
+#include_next <sched.h>
 
 /* 769071ac9f20b6a447410c7eaa55d1a5233ef40c (5.8),
  * defined in sched.h since glibc-2.36. */
 #ifndef CLONE_NEWTIME
 #  define CLONE_NEWTIME 0x00000080
 #else
-assert_cc(CLONE_NEWTIME == 0x00000080);
+_Static_assert(CLONE_NEWTIME == 0x00000080, "");
 #endif
 
 /* Not exposed yet. Defined at include/linux/sched.h */
 #ifndef PF_KTHREAD
 #  define PF_KTHREAD 0x00200000
 #else
-assert_cc(PF_KTHREAD == 0x00200000);
+_Static_assert(PF_KTHREAD == 0x00200000, "");
 #endif
 
 /* The maximum thread/process name length including trailing NUL byte. This mimics the kernel definition of
@@ -32,5 +31,5 @@ assert_cc(PF_KTHREAD == 0x00200000);
 #ifndef TASK_COMM_LEN
 #  define TASK_COMM_LEN 16
 #else
-assert_cc(TASK_COMM_LEN == 16);
+_Static_assert(TASK_COMM_LEN == 16, "");
 #endif
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index a7adab2bfa2..3257c1b9dd4 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sched.h>
 #include <stdio.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
@@ -9,7 +10,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "memfd-util.h"
-#include "missing_sched.h"
 #include "string-util.h"
 #include "utf8.h"
 
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index ec62602989d..76074d1c049 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -4,6 +4,7 @@
 /* Missing glibc definitions to access certain kernel APIs */
 
 #include <linux/mempolicy.h>
+#include <sched.h>
 #include <signal.h>
 #include <sys/syscall.h>
 #include <sys/xattr.h>
@@ -15,7 +16,6 @@
 
 #include "forward.h"
 #include "missing_keyctl.h"
-#include "missing_sched.h"
 #include "missing_syscall_def.h"
 
 /* ======================================================================= */
diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
index bed67619e2d..35a8693cb1c 100644
--- a/src/basic/namespace-util.c
+++ b/src/basic/namespace-util.c
@@ -11,7 +11,6 @@
 #include "log.h"
 #include "missing_magic.h"
 #include "missing_namespace.h"
-#include "missing_sched.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "parse-util.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index e05329b4069..1d341aa0a7e 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -34,7 +34,6 @@
 #include "locale-util.h"
 #include "log.h"
 #include "memory-util.h"
-#include "missing_sched.h"
 #include "missing_syscall.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index 91b0069fb5b..36202cc0ba4 100644
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -11,7 +11,6 @@
 
 #include "log.h"
 #include "macro.h"
-#include "missing_sched.h"
 #include "process-util.h"
 
 /**
diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index ec6729ae37b..a73f87279fb 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -52,7 +52,6 @@
 #include "journal-send.h"
 #include "manager.h"
 #include "memfd-util.h"
-#include "missing_sched.h"
 #include "missing_syscall.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c
index d29237e43b5..54a54d105c5 100644
--- a/src/journal/journalctl-filter.c
+++ b/src/journal/journalctl-filter.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sched.h>
+
 #include "sd-device.h"
 #include "sd-journal.h"
 
@@ -14,7 +16,6 @@
 #include "journalctl-util.h"
 #include "log.h"
 #include "logs-show.h"
-#include "missing_sched.h"
 #include "path-util.h"
 #include "set.h"
 #include "stat-util.h"
diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index 3ec575ac48f..7157106c086 100644
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -30,7 +30,6 @@
 #include "json-util.h"
 #include "main-func.h"
 #include "missing_magic.h"
-#include "missing_sched.h"
 #include "missing_syscall.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
diff --git a/src/nsresourced/test-userns-restrict.c b/src/nsresourced/test-userns-restrict.c
index e4741784f24..68ac3e47220 100644
--- a/src/nsresourced/test-userns-restrict.c
+++ b/src/nsresourced/test-userns-restrict.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sched.h>
 #include <sys/eventfd.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
@@ -9,7 +10,6 @@
 #include "fd-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_sched.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "rm-rf.h"
diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h
index 1bb46d3d3cd..35bcb6a8c99 100644
--- a/src/shared/nsflags.h
+++ b/src/shared/nsflags.h
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <sched.h>
+
 #include "forward.h"
-#include "missing_sched.h"
 
 /* The combination of all namespace flags defined by the kernel. The right type for this isn't clear. setns() and
  * unshare() expect these flags to be passed as (signed) "int", while clone() wants them as "unsigned long". The latter
diff --git a/src/shared/nsresource.c b/src/shared/nsresource.c
index e74e5fcc700..d199d437d5f 100644
--- a/src/shared/nsresource.c
+++ b/src/shared/nsresource.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sched.h>
 #include <sys/prctl.h>
 
 #include "sd-varlink.h"
@@ -9,7 +10,6 @@
 #include "format-util.h"
 #include "json-util.h"
 #include "log.h"
-#include "missing_sched.h"
 #include "namespace-util.h"
 #include "nsresource.h"
 #include "process-util.h"
diff --git a/src/test/test-argv-util.c b/src/test/test-argv-util.c
index 4a3ac700ac5..f7a99ff26d9 100644
--- a/src/test/test-argv-util.c
+++ b/src/test/test-argv-util.c
@@ -8,7 +8,6 @@
 #endif
 
 #include "argv-util.h"
-#include "missing_sched.h"
 #include "process-util.h"
 #include "tests.h"
 #include "virt.h"
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 376b20b0484..5cc185973b4 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -26,7 +26,6 @@
 #include "fd-util.h"
 #include "ioprio-util.h"
 #include "log.h"
-#include "missing_sched.h"
 #include "namespace-util.h"
 #include "parse-util.h"
 #include "pidfd-util.h"
diff --git a/src/test/test-raw-clone.c b/src/test/test-raw-clone.c
index 097bbfe29aa..3a0da73b82d 100644
--- a/src/test/test-raw-clone.c
+++ b/src/test/test-raw-clone.c
@@ -5,7 +5,6 @@
 
 #include "errno-util.h"
 #include "format-util.h"
-#include "missing_sched.h"
 #include "raw-clone.h"
 #include "tests.h"
 
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 9acb558d402..7199b2fb33b 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -21,7 +21,6 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "memory-util.h"
-#include "missing_sched.h"
 #include "missing_syscall.h"
 #include "nsflags.h"
 #include "nulstr-util.h"