Skip to content

Add PR_SET_MEMORY_MERGE and PR_GET_MEMORY_MERGE for linux #5060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fspv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add PR_SET_MEMORY_MERGE and PR_GET_MEMORY_MERGE for linux #5060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions libc-test/semver/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/unix/linux_like/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down