mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
make all other allocs possibly oomable
This commit is contained in:
parent
de7d876820
commit
a799e4b09d
1 changed files with 4 additions and 3 deletions
|
|
@ -368,7 +368,7 @@ impl MemoryMapping {
|
||||||
#[cfg(not(feature = "swap"))]
|
#[cfg(not(feature = "swap"))]
|
||||||
let l0pt_phys = mm.alloc_page(pid)?;
|
let l0pt_phys = mm.alloc_page(pid)?;
|
||||||
#[cfg(feature = "swap")]
|
#[cfg(feature = "swap")]
|
||||||
let l0pt_phys = mm.alloc_page(pid, None)?;
|
let l0pt_phys = mm.alloc_page_oomable(pid, None)?;
|
||||||
|
|
||||||
// Mark this entry as a leaf node (WRX as 0), and indicate
|
// Mark this entry as a leaf node (WRX as 0), and indicate
|
||||||
// it is a valid page by setting "V".
|
// it is a valid page by setting "V".
|
||||||
|
|
@ -630,7 +630,7 @@ pub fn map_page_inner(
|
||||||
#[cfg(not(feature = "swap"))]
|
#[cfg(not(feature = "swap"))]
|
||||||
let l0_pt_phys = mm.alloc_page(pid)?;
|
let l0_pt_phys = mm.alloc_page(pid)?;
|
||||||
#[cfg(feature = "swap")]
|
#[cfg(feature = "swap")]
|
||||||
let l0_pt_phys = mm.alloc_page(pid, None)?;
|
let l0_pt_phys = mm.alloc_page_oomable(pid, None)?;
|
||||||
|
|
||||||
// Mark this entry as a leaf node (WRX as 0), and indicate
|
// Mark this entry as a leaf node (WRX as 0), and indicate
|
||||||
// it is a valid page by setting "V".
|
// it is a valid page by setting "V".
|
||||||
|
|
@ -934,7 +934,8 @@ pub fn ensure_page_exists_inner(address: usize) -> Result<usize, xous_kernel::Er
|
||||||
});
|
});
|
||||||
#[cfg(feature = "swap")]
|
#[cfg(feature = "swap")]
|
||||||
let new_page = MemoryManager::with_mut(|mm| {
|
let new_page = MemoryManager::with_mut(|mm| {
|
||||||
mm.alloc_page_oomable(crate::arch::process::current_pid(), virt).expect("Couldn't allocate new page")
|
mm.alloc_page_oomable(crate::arch::process::current_pid(), Some(virt))
|
||||||
|
.expect("Couldn't allocate new page")
|
||||||
});
|
});
|
||||||
|
|
||||||
let ppn1 = (new_page >> 22) & ((1 << 12) - 1);
|
let ppn1 = (new_page >> 22) & ((1 << 12) - 1);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue