From fa23a6f8293a870f86639d0eb312ca6b3ede9d8f Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 1 Apr 2024 14:07:14 +0800 Subject: [PATCH] remove swap-specific patches now that we're patched at the syscall entry point --- kernel/src/mem.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index afb86c8bb..c2a68f256 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -6,7 +6,7 @@ use core::fmt; use xous_kernel::{MemoryFlags, MemoryRange, PID}; pub use crate::arch::mem::{MemoryMapping, PAGE_SIZE}; -use crate::{arch::process::Process, swap::Swap}; +use crate::arch::process::Process; #[derive(Debug)] enum ClaimReleaseMove { @@ -463,19 +463,12 @@ impl MemoryManager { /// * MemoryInUse - The specified page is already mapped pub fn unmap_page(&mut self, virt: *mut usize) -> Result { let pid = crate::arch::process::current_pid(); - let tid = crate::arch::process::current_tid(); // If the virtual address has an assigned physical address, release that // address from this process. if let Ok(phys) = crate::arch::mem::virt_to_phys(virt as usize) { self.release_page(phys as *mut usize, pid).ok(); - #[cfg(feature = "swap")] - Swap::with_mut(|s| s.advise_alloc(pid, tid, virt as usize, phys, false)); - } else { - // return a null physical pointer if the virtual memory is just being freed - #[cfg(feature = "swap")] - Swap::with_mut(|s| s.advise_alloc(pid, tid, virt as usize, 0, false)); - }; + } // Free the virtual address. crate::arch::mem::unmap_page_inner(self, virt as usize)