Merge branch 'rw_van_230723' into 'master'

acpid: fix physmap size bug

See merge request redox-os/drivers!104
This commit is contained in:
Jeremy Soller
2023-07-24 12:27:39 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -191,7 +191,7 @@ impl Sdt {
while left > 0 {
let to_copy = std::cmp::min(left, length_per_iteration);
let additional_pages = PhysmapGuard::map(offset, length_per_iteration)?;
let additional_pages = PhysmapGuard::map(offset, to_copy.div_ceil(PAGE_SIZE))?;
loaded.extend(&additional_pages[..to_copy]);
+1 -1
View File
@@ -1,4 +1,4 @@
#![feature(if_let_guard)]
#![feature(if_let_guard, int_roundings)]
use std::convert::TryFrom;
use std::io::{self, prelude::*};