From 7d38d1761ef04d8f451bce11b8b12d8bfaf667d9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 1 Apr 2024 15:58:16 +0800 Subject: [PATCH] add missing config flags --- kernel/src/arch/riscv/irq.rs | 7 +++++-- kernel/src/arch/riscv/mem.rs | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/src/arch/riscv/irq.rs b/kernel/src/arch/riscv/irq.rs index c438e3b8c..e9f4f5ee8 100644 --- a/kernel/src/arch/riscv/irq.rs +++ b/kernel/src/arch/riscv/irq.rs @@ -9,9 +9,12 @@ use xous_kernel::{SysCall, PID, TID}; use crate::arch::current_pid; use crate::arch::exception::RiscvException; use crate::arch::mem::MemoryMapping; +#[cfg(feature = "swap")] +use crate::arch::process::RETURN_FROM_SWAPPER; use crate::arch::process::{Process as ArchProcess, RETURN_FROM_EXCEPTION_HANDLER}; -use crate::arch::process::{Thread, EXIT_THREAD, RETURN_FROM_ISR, RETURN_FROM_SWAPPER}; +use crate::arch::process::{Thread, EXIT_THREAD, RETURN_FROM_ISR}; use crate::services::SystemServices; +#[cfg(feature = "swap")] use crate::swap::Swap; extern "Rust" { @@ -307,7 +310,7 @@ pub extern "C" fn trap_handler( crate::arch::syscall::resume(current_pid().get() == 1, process.current_thread()) }); } - + #[cfg(feature = "swap")] RiscvException::InstructionPageFault(RETURN_FROM_SWAPPER, _offset) => { #[cfg(feature = "debug-swap")] { diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 1dc385ff1..aed182ed5 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -10,6 +10,7 @@ use xous_kernel::{MemoryFlags, PID}; use crate::arch::process::InitialProcess; use crate::mem::MemoryManager; +#[cfg(feature = "swap")] use crate::swap::Swap; // pub const DEFAULT_STACK_TOP: usize = 0x8000_0000;