diff options
| -rw-r--r-- | src/kernel.rs | 4 | ||||
| -rw-r--r-- | src/mem/alloc.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel.rs b/src/kernel.rs index a6d8402..e92c701 100644 --- a/src/kernel.rs +++ b/src/kernel.rs @@ -32,7 +32,7 @@ mod sync; mod uart; mod util; use crate::console::console; -use crate::mem::alloc::alloc; +use crate::mem::alloc::allocator; /// # Initialization Code /// @@ -51,7 +51,7 @@ use crate::mem::alloc::alloc; /// the regular main. unsafe fn kernel_init() -> ! { console().init().unwrap(); - alloc().init().unwrap(); + allocator().init().unwrap(); kernel_main() } diff --git a/src/mem/alloc.rs b/src/mem/alloc.rs index 307be5c..a98e680 100644 --- a/src/mem/alloc.rs +++ b/src/mem/alloc.rs @@ -303,7 +303,7 @@ pub static ALLOCATOR: GrandAllocator = GrandAllocator{}; /// # Global Allocator /// /// Returns a borrow for the Global Allocator -pub fn alloc() -> &'static crate::mem::alloc::GrandAllocator { +pub fn allocator() -> &'static crate::mem::alloc::GrandAllocator { vprintln!("AL: Getting global allocator!"); &crate::mem::alloc::ALLOCATOR } |