Merge branch 'hermit-os:main' into main

hermit-os · Oct 4, 2023 · 45cc1b2 · 45cc1b2
2 parents 9a0ed35 + 315f58f
commit 45cc1b2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -122,7 +122,6 @@ x86_64 = "0.14"
 aarch64 = { version = "0.0", default-features = false }
 arm-gic = { version = "0.1" }
 hermit-dtb = { version = "0.1" }
-tock-registers = { version = "0.8", default-features = false }
 
 [dev-dependencies]
 float-cmp = "0.9"

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-09-15"
+channel = "nightly-2023-10-01"
 components = [
     "llvm-tools",
     "rust-src",

diff --git a/src/arch/aarch64/kernel/interrupts.rs b/src/arch/aarch64/kernel/interrupts.rs
@@ -9,7 +9,6 @@ use arm_gic::gicv3::{GicV3, IntId, Trigger};
 use hashbrown::HashMap;
 use hermit_dtb::Dtb;
 use hermit_sync::{InterruptSpinMutex, InterruptTicketMutex, OnceCell};
-use tock_registers::interfaces::Readable;
 
 use crate::arch::aarch64::kernel::boot_info;
 use crate::arch::aarch64::kernel::core_local::increment_irq_counter;

diff --git a/src/arch/aarch64/kernel/processor.rs b/src/arch/aarch64/kernel/processor.rs
@@ -1,11 +1,10 @@
 use core::arch::asm;
 use core::{fmt, str};
 
-use aarch64::regs::CNTFRQ_EL0;
+use aarch64::regs::{Readable, CNTFRQ_EL0};
 use hermit_dtb::Dtb;
 use hermit_sync::{without_interrupts, Lazy};
 use qemu_exit::QEMUExit;
-use tock_registers::interfaces::Readable;
 
 use crate::arch::aarch64::kernel::boot_info;
 use crate::env;