diff --git a/libc-test/build.rs b/libc-test/build.rs index 3d5fd89d34478..e6618beb295cd 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -4273,6 +4273,8 @@ fn test_linux(target: &str) { | "PR_MDWE_NO_INHERIT" | "PR_MDWE_REFUSE_EXEC_GAIN" | "PR_SET_MDWE" + | "PR_GET_MEMORY_MERGE" + | "PR_SET_MEMORY_MERGE" | "IPPROTO_ETHERNET" | "IPPROTO_MPTCP" | "SI_DETHREAD" diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index 6b78874a1ea07..058af182cec0e 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -2407,6 +2407,7 @@ PR_GET_FPEXC PR_GET_FP_MODE PR_GET_KEEPCAPS PR_GET_MDWE +PR_GET_MEMORY_MERGE PR_GET_NAME PR_GET_NO_NEW_PRIVS PR_GET_PDEATHSIG @@ -2446,6 +2447,7 @@ PR_SET_FPEXC PR_SET_FP_MODE PR_SET_KEEPCAPS PR_SET_MDWE +PR_SET_MEMORY_MERGE PR_SET_MM PR_SET_MM_ARG_END PR_SET_MM_ARG_START diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 6f1261972e9f3..4c9392ab2434e 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -1608,6 +1608,8 @@ pub const PR_SET_MDWE: c_int = 65; pub const PR_GET_MDWE: c_int = 66; pub const PR_MDWE_REFUSE_EXEC_GAIN: c_uint = 1 << 0; pub const PR_MDWE_NO_INHERIT: c_uint = 1 << 1; +pub const PR_SET_MEMORY_MERGE: c_int = 67; +pub const PR_GET_MEMORY_MERGE: c_int = 68; pub const GRND_NONBLOCK: c_uint = 0x0001; pub const GRND_RANDOM: c_uint = 0x0002;