Skip to content

Commit 7fa08a4

Browse files
committed
Auto merge of #2692 - devnexen:mempolicy_update2, r=Amanieu
linux/android mempolicy options update
2 parents abb9b4b + dc6b377 commit 7fa08a4

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

libc-test/build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,8 @@ fn test_android(target: &str) {
17231723

17241724
// is a private value for kernel usage normally
17251725
"FUSE_SUPER_MAGIC" => true,
1726+
// linux 5.12 min
1727+
"MPOL_F_NUMA_BALANCING" => true,
17261728

17271729
_ => false,
17281730
}
@@ -3274,6 +3276,8 @@ fn test_linux(target: &str) {
32743276

32753277
// is a private value for kernel usage normally
32763278
"FUSE_SUPER_MAGIC" => true,
3279+
// linux 5.12 min
3280+
"MPOL_F_NUMA_BALANCING" => true,
32773281

32783282
_ => false,
32793283
}

libc-test/semver/android.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,9 @@ MODULE_INIT_IGNORE_MODVERSIONS
10801080
MODULE_INIT_IGNORE_VERMAGIC
10811081
MPOL_BIND
10821082
MPOL_DEFAULT
1083+
MPOL_F_NUMA_BALANCING
1084+
MPOL_F_RELATIVE_NODES
1085+
MPOL_F_STATIC_NODES
10831086
MPOL_INTERLEAVE
10841087
MPOL_LOCAL
10851088
MPOL_PREFERRED

libc-test/semver/linux-gnu.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ MOD_TAI
147147
MOD_TIMECONST
148148
MPOL_BIND
149149
MPOL_DEFAULT
150+
MPOL_F_NUMA_BALANCING
151+
MPOL_F_RELATIVE_NODES
152+
MPOL_F_STATIC_NODES
150153
MPOL_INTERLEAVE
151154
MPOL_LOCAL
152155
MPOL_PREFERRED

src/unix/linux_like/android/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2470,6 +2470,9 @@ pub const MPOL_PREFERRED: ::c_int = 1;
24702470
pub const MPOL_BIND: ::c_int = 2;
24712471
pub const MPOL_INTERLEAVE: ::c_int = 3;
24722472
pub const MPOL_LOCAL: ::c_int = 4;
2473+
pub const MPOL_F_NUMA_BALANCING: ::c_int = 1 << 13;
2474+
pub const MPOL_F_RELATIVE_NODES: ::c_int = 1 << 14;
2475+
pub const MPOL_F_STATIC_NODES: ::c_int = 1 << 15;
24732476

24742477
// bits/seek_constants.h
24752478
pub const SEEK_DATA: ::c_int = 3;

src/unix/linux_like/linux/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,9 @@ pub const MPOL_PREFERRED: ::c_int = 1;
14831483
pub const MPOL_BIND: ::c_int = 2;
14841484
pub const MPOL_INTERLEAVE: ::c_int = 3;
14851485
pub const MPOL_LOCAL: ::c_int = 4;
1486+
pub const MPOL_F_NUMA_BALANCING: ::c_int = 1 << 13;
1487+
pub const MPOL_F_RELATIVE_NODES: ::c_int = 1 << 14;
1488+
pub const MPOL_F_STATIC_NODES: ::c_int = 1 << 15;
14861489

14871490
align_const! {
14881491
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {

0 commit comments

Comments
 (0)