this time, with saving the merge file (some weirdness in vscode...)

This commit is contained in:
bunnie 2021-10-04 17:34:24 +08:00
parent 44615c9acf
commit 013606a4b2

View file

@ -534,11 +534,7 @@ impl MemoryManager {
// 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) {
<<<<<<< HEAD
self.release_page(phys as *mut usize, pid)?;
=======
self.release_page(phys as *mut usize, pid).ok();
>>>>>>> 24dd538a5c044f7488b3f10dee1d0b61c1cfa34d
};
// Free the virtual address.