temporary CI update

nix-rust · May 25, 2024 · 96d4651 · 96d4651
1 parent e6d9a17
commit 96d4651
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
   # Use cross for QEMU-based testing
   # cross needs to execute Docker, GitHub Action already has it installed
   cross:
-    runs-on: ubuntu-20.04 
+    runs-on: ubuntu-latest
     needs: [rustfmt, minver, macos, linux_native_builds, rust_stable]
     strategy:
       fail-fast: false

diff --git a/src/sys/prctl.rs b/src/sys/prctl.rs
@@ -219,10 +219,10 @@ pub fn get_thp_disable() -> Result<bool> {
 /// Set an identifier (or reset it) to the address memory range.
 pub fn set_vma_anon_name(addr: NonNull<c_void>, length: NonZeroUsize, name: Option<&CStr>) -> Result<()> {
     let nameref = match name {
-        Some(n) => n.as_ptr() as u64,
-        _ => 0u64
+        Some(n) => n.as_ptr() as usize,
+        _ => 0
     };
-    let res = unsafe { libc::prctl(libc::PR_SET_VMA, libc::PR_SET_VMA_ANON_NAME, addr.as_ptr() as u64, length, nameref) };
+    let res = unsafe { libc::prctl(libc::PR_SET_VMA, libc::PR_SET_VMA_ANON_NAME, addr.as_ptr() as usize, length, nameref) };
 
     Errno::result(res).map(drop)
 }
diff --git a/test/sys/test_prctl.rs b/test/sys/test_prctl.rs
@@ -135,8 +135,8 @@ mod test_prctl {
             mman::mmap_anonymous(
                 None,
                 sz,
-                mman::ProtFlags::PROT_READ,
-                mman::MapFlags::MAP_SHARED,
+                mman::ProtFlags::PROT_READ | mman::ProtFlags::PROT_WRITE,
+                mman::MapFlags::MAP_PRIVATE,
             )
             .unwrap()
         };