Skip to content

Commit 306ec4a

Browse files
committed
Update to newest os_bootinfo version
1 parent 1d52d1f commit 306ec4a

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

src/boot_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub(crate) fn create_from(memory_map_addr: VirtAddr, entry_count: u64) -> Memory
1212

1313
let mut memory_map = MemoryMap::new();
1414
for region in e820_memory_map {
15-
memory_map.push(MemoryRegion::from(*region));
15+
memory_map.add_region(MemoryRegion::from(*region));
1616
}
1717

1818
memory_map

src/frame_allocator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ impl<'a> FrameAllocator<'a> {
9494
}
9595

9696
if let Some(new_region) = new_region {
97-
self.memory_map.push(new_region);
97+
self.memory_map.add_region(new_region);
9898
}
9999
if let Some(used_region) = used_region {
100-
self.memory_map.push(used_region);
100+
self.memory_map.add_region(used_region);
101101
}
102102
}
103103
}

src/main.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ pub extern "C" fn load_elf(kernel_start: PhysAddr, kernel_size: u64,
8686
let flags = PageTableFlags::PRESENT;
8787
page_table::identity_map(context_switch_fn_frame, flags, p4, &mut frame_allocator);
8888

89-
let mut boot_info = BootInfo {
90-
memory_map,
91-
p4_table: unsafe { &mut *p4_ptr },
92-
};
89+
let mut boot_info = BootInfo::new(unsafe { &mut *p4_ptr }, memory_map);
9390
boot_info.sort_memory_map();
9491

9592
let boot_info_addr = boot_info_page.start_address();

0 commit comments

Comments
 (0)