Skip to content

Commit 7e810c7

Browse files
tgross35AkhilTThomas
authored andcommitted
Merge pull request rust-lang#4014 from tgross35/backport-swiss-chard
[0.2] Backports
2 parents e5a380f + 9c7eb6c commit 7e810c7

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

libc-test/build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4260,6 +4260,10 @@ fn test_linux(target: &str) {
42604260
// FIXME: Requires >= 6.11 kernel headers.
42614261
"MAP_DROPPABLE" => true,
42624262

4263+
// FIXME: Requires >= 6.9 kernel headers.
4264+
"EPIOCSPARAMS"
4265+
| "EPIOCGPARAMS" => true,
4266+
42634267
_ => false,
42644268
}
42654269
});

src/unix/linux_like/linux/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,15 @@ cfg_if! {
14861486
}
14871487
}
14881488
}
1489+
1490+
// #include <linux/eventpoll.h>
1491+
1492+
pub struct epoll_params {
1493+
pub busy_poll_usecs: u32,
1494+
pub busy_poll_budget: u16,
1495+
pub prefer_busy_poll: u8,
1496+
pub __pad: u8, // Must be zero
1497+
}
14891498
}
14901499

14911500
s_no_extra_traits! {

0 commit comments

Comments
 (0)