From 013606a4b29e13f59fcc4f1777f53532bf70c6e3 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 4 Oct 2021 17:34:24 +0800 Subject: [PATCH] this time, with saving the merge file (some weirdness in vscode...) --- kernel/src/mem.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 4977bd3c2..c84002146 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -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.