From e9950ee6da9e56574b1d534f36600c25505ffb7d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 29 Jul 2022 18:53:12 -0600 Subject: [PATCH] Fix more warnings --- src/arch/x86.rs | 2 +- src/page/mapper.rs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/arch/x86.rs b/src/arch/x86.rs index 0572f4c5fc..d804ed213a 100644 --- a/src/arch/x86.rs +++ b/src/arch/x86.rs @@ -51,7 +51,7 @@ impl Arch for X86Arch { asm!("mov cr3, {0}", in(reg) address.data()); } - fn virt_is_valid(address: VirtualAddress) -> bool { + fn virt_is_valid(_address: VirtualAddress) -> bool { // On 32-bit x86, every virtual address is valid true } diff --git a/src/page/mapper.rs b/src/page/mapper.rs index ce99c6a88e..1e0e98fa13 100644 --- a/src/page/mapper.rs +++ b/src/page/mapper.rs @@ -125,11 +125,12 @@ impl PageMapper { Some(flush) } - pub unsafe fn unmap_phys(&mut self, virt: VirtualAddress, unmap_parents: bool) -> Option<(PhysicalAddress, PageFlags, PageFlush)> { + pub unsafe fn unmap_phys(&mut self, virt: VirtualAddress, _unmap_parents: bool) -> Option<(PhysicalAddress, PageFlags, PageFlush)> { //TODO: verify virt is aligned let mut table = self.table(); let level = table.level(); - unmap_phys_inner(virt, &mut table, level, unmap_parents, &mut self.allocator).map(|(pa, pf)| (pa, pf, PageFlush::new(virt))) + //TODO: use unmap_parents + unmap_phys_inner(virt, &mut table, level, false, &mut self.allocator).map(|(pa, pf)| (pa, pf, PageFlush::new(virt))) } } unsafe fn unmap_phys_inner(virt: VirtualAddress, table: &mut PageTable, initial_level: usize, unmap_parents: bool, allocator: &mut impl FrameAllocator) -> Option<(PhysicalAddress, PageFlags)> {