Fix RISCV init memory

2026-07-16 16:04:31 +07:00
parent f5fe18b23c
commit e100dd5a71
1 changed files with 3 additions and 1 deletions
@@ -105,7 +105,7 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {
            }

            // Initialize RMM
-            crate::startup::memory::init(&args, None, None);
+            let bump_allocator = crate::startup::memory::init(&args, None, None);

            let boot_hart_id =
                get_boot_hart_id(args.env()).expect("Didn't get boot HART id from bootloader");
@@ -114,6 +114,8 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {

            paging::init();

+            crate::memory::init_mm(bump_allocator);
+
            crate::arch::misc::init(crate::cpu_set::LogicalCpuId::new(0));

            // Setup kernel heap