Skip to content

Commit

Permalink
Merge pull request #316 from hermit-os/dependabot/cargo/x86_64-0.15.1
Browse files Browse the repository at this point in the history
build(deps): bump x86_64 from 0.14.12 to 0.15.1
  • Loading branch information
mkroening authored Mar 20, 2024
2 parents ef2f600 + faec36c commit 0cb21fd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ multiboot = "0.8"

[target.'cfg(target_arch = "x86_64")'.dependencies]
uart_16550 = "0.3"
x86_64 = { version = "0.14", default-features = false, features = ["instructions"] }
x86_64 = { version = "0.15", default-features = false, features = ["instructions"] }

[target.'cfg(target_arch = "aarch64")'.dependencies]
aarch64-cpu = "9"
Expand Down
2 changes: 1 addition & 1 deletion src/arch/x86_64/paging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ where
log::warn!(
"Mapping {count} {size} pages from {from_start:p}..{from_end:p} to {to_start:p}..{to_end:p}",
count = (pages.end.start_address() - pages.start.start_address()) / S::SIZE,
size = S::SIZE_AS_DEBUG_STR,
size = S::DEBUG_STR,
from_start = pages.start.start_address(),
from_end = pages.end.start_address(),
to_start = frames.start.start_address(),
Expand Down

0 comments on commit 0cb21fd

Please sign in to comment.