michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-10' into post-11

Browse Source
This commit is contained in:
Philipp Oppermann
2020-03-08 14:30:38 +01:00
parent 3735ae51c9 7b0d8f05ba
commit 714d9cef7d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/allocator.rs
View File

@@ -21,7 +21,7 @@ static ALLOCATOR: Locked<FixedSizeBlockAllocator> = Locked::new(FixedSizeBlockAl
pub fn init_heap( pub fn init_heap(
mapper: &mut impl Mapper<Size4KiB>, mapper: &mut impl Mapper<Size4KiB>,
frame_allocator: &mut impl FrameAllocator<Size4KiB>, frame_allocator: &mut impl FrameAllocator<Size4KiB>,
) -> Result<(), MapToError> { ) -> Result<(), MapToError<Size4KiB>> {
let page_range = { let page_range = {
let heap_start = VirtAddr::new(HEAP_START as u64); let heap_start = VirtAddr::new(HEAP_START as u64);
let heap_end = heap_start + HEAP_SIZE - 1u64; let heap_end = heap_start + HEAP_SIZE - 1u64;