fix(entry): only set boot info globals on first CPU core

Signed-off-by: Martin Kröning <[email protected]>
hermit-os · Oct 20, 2024 · 460202d · 460202d
1 parent 86e6121
commit 460202d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/arch/aarch64/kernel/start.rs b/src/arch/aarch64/kernel/start.rs
@@ -45,11 +45,6 @@ pub unsafe extern "C" fn _start(boot_info: &'static RawBootInfo, cpu_id: u32) ->
 #[inline(never)]
 #[no_mangle]
 unsafe extern "C" fn pre_init(boot_info: &'static RawBootInfo, cpu_id: u32) -> ! {
-	unsafe {
-		RAW_BOOT_INFO = Some(boot_info);
-		BOOT_INFO = Some(BootInfo::from(*boot_info));
-	}
-
 	// set exception table
 	unsafe {
 		asm!(
@@ -66,6 +61,10 @@ unsafe extern "C" fn pre_init(boot_info: &'static RawBootInfo, cpu_id: u32) -> !
 	}
 
 	if cpu_id == 0 {
+		unsafe {
+			RAW_BOOT_INFO = Some(boot_info);
+			BOOT_INFO = Some(BootInfo::from(*boot_info));
+		}
 		crate::boot_processor_main()
 	} else {
 		#[cfg(not(feature = "smp"))]

diff --git a/src/arch/x86_64/kernel/mod.rs b/src/arch/x86_64/kernel/mod.rs
@@ -261,12 +261,12 @@ unsafe extern "C" fn pre_init(boot_info: &'static RawBootInfo, cpu_id: u32) -> !
 		cr0_write(cr0);
 	}
 
-	unsafe {
-		RAW_BOOT_INFO = Some(boot_info);
-		BOOT_INFO = Some(BootInfo::from(*boot_info));
-	}
-
 	if cpu_id == 0 {
+		unsafe {
+			RAW_BOOT_INFO = Some(boot_info);
+			BOOT_INFO = Some(BootInfo::from(*boot_info));
+		}
+
 		crate::boot_processor_main()
 	} else {
 		#[cfg(not(feature = "smp"))]