diff --git a/src/allocator.rs b/src/allocator.rs index 5caaa9c8..e2b6396a 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -1,6 +1,6 @@ use alloc::alloc::{GlobalAlloc, Layout}; +use bump::BumpAllocator; use core::ptr::null_mut; -use linked_list_allocator::LockedHeap; use x86_64::{ structures::paging::{ mapper::MapToError, FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB, @@ -14,7 +14,7 @@ pub const HEAP_START: usize = 0x_4444_4444_0000; pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB #[global_allocator] -static ALLOCATOR: LockedHeap = LockedHeap::empty(); +static ALLOCATOR: Locked = Locked::new(BumpAllocator::new()); pub fn init_heap( mapper: &mut impl Mapper,