From 88972a888595669f00ddff9562ccd207071c9bd1 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Mon, 8 Sep 2025 22:59:04 -0700
Subject: [PATCH 1/2] Fix the `test_is_io_flusher` test.

Capability sets are bitsets, so to compute an index, use
`leading_zeros()` on the bitpattern.
---
 tests/process/prctl.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/process/prctl.rs b/tests/process/prctl.rs
index 25e4828ce..6ec816be1 100644
--- a/tests/process/prctl.rs
+++ b/tests/process/prctl.rs
@@ -175,7 +175,9 @@ pub(crate) fn thread_has_capability(capability: CapabilitySet) -> io::Result<boo
         return Err(io::Error::last_os_error());
     }
 
-    let cap_index = capability.bits() as u32;
+    let cap_bits = capability.bits();
+    assert_eq!(cap_bits.count_ones(), 1);
+    let cap_index = cap_bits.leading_zeros();
     let (data_index, cap_index) = if cap_index < 32 {
         (0, cap_index)
     } else {

From 0ccb964960bb0fd31315b96f10acdd6c8b258549 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Mon, 8 Sep 2025 23:09:08 -0700
Subject: [PATCH 2/2] Fix compilation with individual features enabled.

---
 src/backend/linux_raw/c.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/linux_raw/c.rs b/src/backend/linux_raw/c.rs
index 5939c9ec0..762cdd479 100644
--- a/src/backend/linux_raw/c.rs
+++ b/src/backend/linux_raw/c.rs
@@ -117,10 +117,10 @@ pub(crate) use linux_raw_sys::{
     },
 };
 
-#[cfg(feature = "time")]
+#[cfg(any(feature = "io_uring", feature = "time", feature = "thread"))]
 pub use linux_raw_sys::general::__kernel_clockid_t as clockid_t;
 
-#[cfg(all(feature = "net", feature = "time"))]
+#[cfg(feature = "net")]
 pub use linux_raw_sys::net::{sock_txtime, SCM_TXTIME, SO_TXTIME};
 
 #[cfg(all(feature = "net", feature = "time"))]