From 7a27cd7ebdcb82ce34cd849ff36847e22cbc9ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Thu, 2 May 2024 16:10:11 +0200 Subject: [PATCH] refactor(x86_64/interrupts): use idt::HandlerFunc alias from x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- src/arch/x86_64/kernel/interrupts.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/arch/x86_64/kernel/interrupts.rs b/src/arch/x86_64/kernel/interrupts.rs index fd170b0f58..3da74a211d 100644 --- a/src/arch/x86_64/kernel/interrupts.rs +++ b/src/arch/x86_64/kernel/interrupts.rs @@ -8,7 +8,7 @@ use hermit_sync::{InterruptSpinMutex, InterruptTicketMutex}; pub use x86_64::instructions::interrupts::{disable, enable, enable_and_hlt as enable_and_wait}; use x86_64::set_general_handler; pub use x86_64::structures::idt::InterruptStackFrame as ExceptionStackFrame; -use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame}; +use x86_64::structures::idt::{self, InterruptDescriptorTable}; use crate::arch::x86_64::kernel::core_local::{core_scheduler, increment_irq_counter}; use crate::arch::x86_64::kernel::{apic, processor}; @@ -109,10 +109,7 @@ pub(crate) fn install() { } #[no_mangle] -pub extern "C" fn irq_install_handler( - irq_number: u8, - handler: extern "x86-interrupt" fn(InterruptStackFrame), -) { +pub extern "C" fn irq_install_handler(irq_number: u8, handler: idt::HandlerFunc) { debug!("Install handler for interrupt {}", irq_number); let mut idt = IDT.lock();