Skip to content

Commit

Permalink
latest rust changes
Browse files Browse the repository at this point in the history
Signed-off-by: Graham MacDonald <[email protected]>
  • Loading branch information
gmacd committed Jun 11, 2024
1 parent 0037b95 commit e92b708
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions aarch64/src/vmalloc.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use core::mem::MaybeUninit;
use core::{mem::MaybeUninit, ptr::addr_of};

use port::{
mcslock::{Lock, LockNode},
Expand All @@ -18,7 +18,7 @@ impl VmAlloc {
fn new(heap_range: VirtRange) -> Self {
let quantum = 4096;

let early_tags_ptr = unsafe { &EARLY_TAGS_PAGE as *const _ as usize };
let early_tags_ptr = unsafe { addr_of!(EARLY_TAGS_PAGE) as usize };
let early_tags_size = unsafe { EARLY_TAGS_PAGE.len() };
let early_tags_range = VirtRange::with_len(early_tags_ptr, early_tags_size);

Expand Down
1 change: 0 additions & 1 deletion port/src/vmem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,6 @@ impl Arena {

#[cfg(test)]
mod tests {
use core::mem::size_of;

use super::*;

Expand Down

0 comments on commit e92b708

Please sign in to comment.