From 5f425ebc56edf82621a869159375f7a75a72e1bc Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 1 May 2024 14:27:06 +0800 Subject: [PATCH] expand flags scope and fix swap test --- kernel/src/arch/riscv/mem.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 64ed5185e..de19f60d9 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -898,7 +898,7 @@ pub fn ensure_page_exists_inner(address: usize) -> Result Result> 12) & ((1 << 10) - 1); unsafe { #[cfg(feature = "swap")] - if flags & MMUFlags::P.bits() == 1 { + if flags & MMUFlags::P.bits() != 0 { // page is swapped; fill page, map and return Swap::with_mut(|s| s.retrieve_page(crate::arch::process::current_pid(), virt, new_page)) // the execution flow diverges from here: it returns via the interrupt context handler. -> ! } else { - // page is reserved: simple zero it out + // page is reserved: simply zero it out // Map the page to our process *entry = (ppn1 << 20) | (ppn0 << 10) | (flags | FLG_VALID /* valid */ | FLG_D /* D */ | FLG_A/* A */);