Skip to content

Commit 2aa4abf

Browse files
Merge branch 'rust-osdev:main' into master
2 parents 02ecbb2 + 63340a3 commit 2aa4abf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/src/load_kernel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ where
269269
// map additional frames for `.bss` memory that is not present in source file
270270
let start_page: Page =
271271
Page::containing_address(VirtAddr::new(align_up(zero_start.as_u64(), Size4KiB::SIZE)));
272-
let end_page = Page::containing_address(zero_end);
272+
let end_page = Page::containing_address(zero_end - 1u64);
273273
for page in Page::range_inclusive(start_page, end_page) {
274274
// allocate a new unused frame
275275
let frame = self.frame_allocator.allocate_frame().unwrap();

0 commit comments

Comments
 (0)