Merge branch 'post-11' into post-12

This commit is contained in:
Philipp Oppermann
2025-03-27 15:16:18 +01:00
3 changed files with 4 additions and 4 deletions

View File

@@ -75,7 +75,7 @@ pub fn hlt_loop() -> ! {
}
#[cfg(test)]
use bootloader::{entry_point, BootInfo};
use bootloader::{BootInfo, entry_point};
#[cfg(test)]
entry_point!(test_kernel_main);