From b5ee44621c4df690845cada0c93dd25db658bd11 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 30 Apr 2019 12:59:23 +0200 Subject: [PATCH] Use an import for initializing BootInfoFrameAllocator --- src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index a248458f..c31a92b5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,14 +11,14 @@ use core::panic::PanicInfo; entry_point!(kernel_main); fn kernel_main(boot_info: &'static BootInfo) -> ! { - use blog_os::memory; + use blog_os::memory::{self, BootInfoFrameAllocator}; use x86_64::{structures::paging::Page, VirtAddr}; println!("Hello World{}", "!"); blog_os::init(); let mut mapper = unsafe { memory::init(boot_info.physical_memory_offset) }; - let mut frame_allocator = memory::BootInfoFrameAllocator::init(&boot_info.memory_map); + let mut frame_allocator = BootInfoFrameAllocator::init(&boot_info.memory_map); // map a previously unmapped page let page = Page::containing_address(VirtAddr::new(0xdeadbeaf000));