From 6a7891838e0967e1149b89025a92235959a42261 Mon Sep 17 00:00:00 2001 From: Mark Poliakov Date: Tue, 10 Dec 2024 20:39:12 +0200 Subject: [PATCH] aarch64: fix timer warnings --- kernel/src/arch/aarch64/mod.rs | 4 ++-- kernel/src/arch/aarch64/timer.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/src/arch/aarch64/mod.rs b/kernel/src/arch/aarch64/mod.rs index b6195189..f435c7cf 100644 --- a/kernel/src/arch/aarch64/mod.rs +++ b/kernel/src/arch/aarch64/mod.rs @@ -2,7 +2,7 @@ use core::sync::atomic::Ordering; -use aarch64_cpu::registers::{CNTPCT_EL0, CNTP_CTL_EL0, CNTP_TVAL_EL0}; +use aarch64_cpu::registers::{CNTP_CTL_EL0, CNTP_TVAL_EL0}; use abi::error::Error; use alloc::sync::Arc; use device_api::{ @@ -31,7 +31,7 @@ use libk_mm::{ table::EntryLevelExt, }; use libk_util::OneTimeInit; -use tock_registers::interfaces::{Readable, Writeable}; +use tock_registers::interfaces::Writeable; use ygg_driver_pci::PciBusManager; use crate::{ diff --git a/kernel/src/arch/aarch64/timer.rs b/kernel/src/arch/aarch64/timer.rs index 0534f4e2..1a5bf667 100644 --- a/kernel/src/arch/aarch64/timer.rs +++ b/kernel/src/arch/aarch64/timer.rs @@ -10,7 +10,7 @@ use device_api::{ interrupt::{InterruptHandler, Irq}, }; use device_tree::device_tree_driver; -use kernel_arch::{task::Scheduler, Architecture, ArchitectureImpl}; +use kernel_arch::task::Scheduler; use libk::{arch::Cpu, device::external_interrupt_controller, task::runtime, time}; use tock_registers::interfaces::{ReadWriteable, Readable, Writeable};