From 8c82d710bbf1ee2e5708db3fd6f64c002738f7f6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 9 Apr 2024 15:25:59 +0800 Subject: [PATCH] reflect swap offset patches in atamsam5d27 arch --- loader/src/platform/atsama5d27/boot.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/src/platform/atsama5d27/boot.rs b/loader/src/platform/atsama5d27/boot.rs index afbee2624..c5c6bef28 100644 --- a/loader/src/platform/atsama5d27/boot.rs +++ b/loader/src/platform/atsama5d27/boot.rs @@ -326,7 +326,7 @@ pub fn map_structs_to_kernel(cfg: &mut BootConfig, table_addr: usize, krn_struct dprintln!("Making the kernel arguments visible"); cfg.map_page(translation_table, 0x20100000, 0x20100000, FLG_R | FLG_X | FLG_VALID, 1 as XousPid); - for addr in (0..cfg.init_size - GUARD_MEMORY_BYTES).step_by(PAGE_SIZE) { + for addr in (0..cfg.init_size - GUARD_MEMORY_BYTES + cfg.swap_offset).step_by(PAGE_SIZE) { cfg.map_page( tt, addr + krn_struct_start, @@ -400,7 +400,7 @@ pub fn map_kernel_to_processes( } println!("Mapping kernel structures to PID{}", process.asid); - for addr in (0..cfg.init_size - GUARD_MEMORY_BYTES).step_by(PAGE_SIZE) { + for addr in (0..cfg.init_size - GUARD_MEMORY_BYTES + cfg.swap_offset).step_by(PAGE_SIZE) { cfg.map_page( translation_table, addr + krn_struct_start,