From bf12ec2c29e82e9a2ce1b03debed00e432d4ae09 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 10 Jan 2024 16:33:56 +0100 Subject: [PATCH] Provide the same sched.h constants for musl as gnu --- libc-test/semver/linux-gnu.txt | 3 --- libc-test/semver/linux.txt | 3 +++ src/unix/linux_like/linux/gnu/mod.rs | 5 ----- src/unix/linux_like/linux/mod.rs | 4 ++++ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt index c88da4fe9bf6e..6618f80b3bdd7 100644 --- a/libc-test/semver/linux-gnu.txt +++ b/libc-test/semver/linux-gnu.txt @@ -31,9 +31,6 @@ BPF_FS_MAGIC BTRFS_SUPER_MAGIC CGROUP2_SUPER_MAGIC CGROUP_SUPER_MAGIC -CLONE_CLEAR_SIGHAND -CLONE_INTO_CGROUP -CLONE_NEWTIME CODA_SUPER_MAGIC CRAMFS_MAGIC DEAD_PROCESS diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index a8806a36f4600..c8aa264ebc5b3 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -273,15 +273,18 @@ CLOCK_TAI CLOCK_THREAD_CPUTIME_ID CLONE_CHILD_CLEARTID CLONE_CHILD_SETTID +CLONE_CLEAR_SIGHAND CLONE_DETACHED CLONE_FILES CLONE_FS +CLONE_INTO_CGROUP CLONE_IO CLONE_NEWCGROUP CLONE_NEWIPC CLONE_NEWNET CLONE_NEWNS CLONE_NEWPID +CLONE_NEWTIME CLONE_NEWUSER CLONE_NEWUTS CLONE_PARENT diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index 06c6fe6714d35..72d76328aa621 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -889,11 +889,6 @@ pub const GENL_ID_PMCRAID: c_int = crate::NLMSG_MIN_TYPE + 2; pub const ELFOSABI_ARM_AEABI: u8 = 64; -// linux/sched.h -pub const CLONE_NEWTIME: c_int = 0x80; -pub const CLONE_CLEAR_SIGHAND: c_ulonglong = 0x100000000; -pub const CLONE_INTO_CGROUP: c_ulonglong = 0x200000000; - // linux/keyctl.h pub const KEYCTL_DH_COMPUTE: u32 = 23; pub const KEYCTL_PKEY_QUERY: u32 = 24; diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 3f481fb755c8d..3fda86c6fe2c4 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -5633,6 +5633,10 @@ pub const SCHED_FLAG_KEEP_PARAMS: c_int = 0x10; pub const SCHED_FLAG_UTIL_CLAMP_MIN: c_int = 0x20; pub const SCHED_FLAG_UTIL_CLAMP_MAX: c_int = 0x40; +pub const CLONE_NEWTIME: c_int = 0x80; +pub const CLONE_CLEAR_SIGHAND: c_ulonglong = 0x100000000; +pub const CLONE_INTO_CGROUP: c_ulonglong = 0x200000000; + // linux/if_xdp.h pub const XDP_SHARED_UMEM: crate::__u16 = 1 << 0; pub const XDP_COPY: crate::__u16 = 1 << 1;