mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
this time, with saving the merge file (some weirdness in vscode...)
This commit is contained in:
parent
44615c9acf
commit
013606a4b2
1 changed files with 0 additions and 4 deletions
|
|
@ -534,11 +534,7 @@ impl MemoryManager {
|
||||||
// If the virtual address has an assigned physical address, release that
|
// If the virtual address has an assigned physical address, release that
|
||||||
// address from this process.
|
// address from this process.
|
||||||
if let Ok(phys) = crate::arch::mem::virt_to_phys(virt as usize) {
|
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();
|
self.release_page(phys as *mut usize, pid).ok();
|
||||||
>>>>>>> 24dd538a5c044f7488b3f10dee1d0b61c1cfa34d
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Free the virtual address.
|
// Free the virtual address.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue