From a9fe65a0ce142cc753a089001f81fc64eb749c81 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 10 Jan 2020 13:04:46 +0100 Subject: [PATCH] Use new LinkedListAllocator --- src/allocator.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allocator.rs b/src/allocator.rs index 52ebbd68..33e592ae 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::LinkedListAllocator; use x86_64::{ structures::paging::{ mapper::MapToError, FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB, @@ -15,7 +15,7 @@ pub const HEAP_START: usize = 0x_4444_4444_0000; pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB #[global_allocator] -static ALLOCATOR: Locked = Locked::new(BumpAllocator::new()); +static ALLOCATOR: Locked = Locked::new(LinkedListAllocator::new()); pub fn init_heap( mapper: &mut impl Mapper,