Skip to content

Commit 08ff6c8

Browse files
committed
Fix build
1 parent 6a9c36d commit 08ff6c8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ use core::{mem, slice};
1414
use fixedvec::alloc_stack;
1515
use usize_conversions::usize_from;
1616
use x86_64::structures::paging::{Mapper, RecursivePageTable};
17-
use x86_64::structures::paging::{Page, PageTableFlags, PhysFrame, PhysFrameRange, Size2MiB};
17+
use x86_64::structures::paging::{Page, PageTableFlags, PhysFrame, PhysFrameRange, Size4KiB,
18+
Size2MiB};
1819
use x86_64::ux::u9;
1920
use x86_64::{PhysAddr, VirtAddr};
2021

@@ -115,7 +116,6 @@ fn load_elf(
115116

116117
let mut memory_map = boot_info::create_from(memory_map_addr, memory_map_entry_count);
117118

118-
#[cfg(feature = "map_physical_memory")]
119119
let max_phys_addr = memory_map
120120
.iter()
121121
.map(|r| r.range.end_addr())
@@ -269,7 +269,7 @@ fn load_elf(
269269
if cfg!(not(feature = "recursive_page_table")) {
270270
// unmap recursive entry
271271
rec_page_table
272-
.unmap(recursive_page_table_addr)
272+
.unmap(Page::<Size4KiB>::containing_address(recursive_page_table_addr))
273273
.expect("error deallocating recursive entry")
274274
.1
275275
.flush();

0 commit comments

Comments
 (0)