Skip to content

Commit fdc630f

Browse files
committed
Make query_memory_map unsafe
1 parent 50e4563 commit fdc630f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

bios/stage-2/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
9797
let kernel_len = load_file("kernel-x86_64", KERNEL_DST, &mut fs, &mut disk, disk_buffer);
9898
writeln!(screen::Writer, "kernel loaded at {KERNEL_DST:#p}").unwrap();
9999

100-
let memory_map = memory_map::query_memory_map().unwrap();
100+
let memory_map = unsafe { memory_map::query_memory_map() }.unwrap();
101101
writeln!(screen::Writer, "{memory_map:x?}").unwrap();
102102

103103
// TODO: load these from the kernel's config instead of hardcoding

bios/stage-2/src/memory_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ static MEMORY_MAP: RacyCell<[E820MemoryRegion; 100]> = RacyCell::new(
1414
);
1515

1616
/// use the INT 0x15, eax= 0xE820 BIOS function to get a memory map
17-
pub fn query_memory_map() -> Result<&'static mut [E820MemoryRegion], ()> {
17+
pub unsafe fn query_memory_map() -> Result<&'static mut [E820MemoryRegion], ()> {
1818
const SMAP: u32 = 0x534D4150;
1919

2020
let memory_map = unsafe { MEMORY_MAP.get_mut() };

0 commit comments

Comments
 (0)