diff --git a/src/arch/x86_64/interrupt/handler.rs b/src/arch/x86_64/interrupt/handler.rs
index 226aaa708f..7601925ab1 100644
--- a/src/arch/x86_64/interrupt/handler.rs
+++ b/src/arch/x86_64/interrupt/handler.rs
@@ -416,9 +416,9 @@ macro_rules! interrupt {
     ($name:ident, || $code:block) => {
         #[naked]
         pub unsafe extern "C" fn $name() { unsafe {
-            unsafe extern "C" fn inner() { unsafe {
+            unsafe extern "C" fn inner() {
                 $code
-            }}
+            }
 
             core::arch::naked_asm!(concat!(
                 // Clear direction flag, required by ABI when running any Rust code in the kernel.
diff --git a/src/arch/x86_64/interrupt/irq.rs b/src/arch/x86_64/interrupt/irq.rs
index ee44f081b1..a8aa535c5b 100644
--- a/src/arch/x86_64/interrupt/irq.rs
+++ b/src/arch/x86_64/interrupt/irq.rs
@@ -188,16 +188,16 @@ interrupt_stack!(pit_stack, |_stack| {
 
 interrupt!(keyboard, || {
     let data: u8;
-    core::arch::asm!("in al, 0x60", out("al") data);
+    unsafe { core::arch::asm!("in al, 0x60", out("al") data) };
 
-    eoi(1);
+    unsafe { eoi(1) };
 
     serio_input(0, data);
 });
 
 interrupt!(cascade, || {
     // No need to do any operations on cascade
-    eoi(2);
+    unsafe { eoi(2) };
 });
 
 interrupt!(com2, || {
@@ -205,7 +205,7 @@ interrupt!(com2, || {
         debug_input(c);
     }
     debug_notify();
-    eoi(3);
+    unsafe { eoi(3) };
 });
 
 interrupt!(com1, || {
@@ -213,81 +213,101 @@ interrupt!(com1, || {
         debug_input(c);
     }
     debug_notify();
-    eoi(4);
+    unsafe { eoi(4) };
 });
 
 interrupt!(lpt2, || {
-    trigger(5);
-    eoi(5);
+    unsafe {
+        trigger(5);
+        eoi(5);
+    }
 });
 
 interrupt!(floppy, || {
-    trigger(6);
-    eoi(6);
+    unsafe {
+        trigger(6);
+        eoi(6);
+    }
 });
 
 interrupt!(lpt1, || {
-    if irq_method() == IrqMethod::Pic && pic::master().isr() & (1 << 7) == 0 {
-        // the IRQ was spurious, ignore it but increment a counter.
-        SPURIOUS_COUNT_IRQ7.fetch_add(1, Ordering::Relaxed);
-        return;
+    unsafe {
+        if irq_method() == IrqMethod::Pic && pic::master().isr() & (1 << 7) == 0 {
+            // the IRQ was spurious, ignore it but increment a counter.
+            SPURIOUS_COUNT_IRQ7.fetch_add(1, Ordering::Relaxed);
+            return;
+        }
+        trigger(7);
+        eoi(7);
     }
-    trigger(7);
-    eoi(7);
 });
 
 interrupt!(rtc, || {
-    trigger(8);
-    eoi(8);
+    unsafe {
+        trigger(8);
+        eoi(8);
+    }
 });
 
 interrupt!(pci1, || {
-    trigger(9);
-    eoi(9);
+    unsafe {
+        trigger(9);
+        eoi(9);
+    }
 });
 
 interrupt!(pci2, || {
-    trigger(10);
-    eoi(10);
+    unsafe {
+        trigger(10);
+        eoi(10)
+    };
 });
 
 interrupt!(pci3, || {
-    trigger(11);
-    eoi(11);
+    unsafe {
+        trigger(11);
+        eoi(11)
+    };
 });
 
 interrupt!(mouse, || {
     let data: u8;
-    core::arch::asm!("in al, 0x60", out("al") data);
+    unsafe { core::arch::asm!("in al, 0x60", out("al") data) };
 
-    eoi(12);
+    unsafe { eoi(12) };
 
     serio_input(1, data);
 });
 
 interrupt!(fpu, || {
-    trigger(13);
-    eoi(13);
+    unsafe {
+        trigger(13);
+        eoi(13);
+    }
 });
 
 interrupt!(ata1, || {
-    trigger(14);
-    eoi(14);
+    unsafe {
+        trigger(14);
+        eoi(14);
+    }
 });
 
 interrupt!(ata2, || {
-    if irq_method() == IrqMethod::Pic && pic::slave().isr() & (1 << 7) == 0 {
-        SPURIOUS_COUNT_IRQ15.fetch_add(1, Ordering::Relaxed);
-        pic::master().ack();
-        return;
+    unsafe {
+        if irq_method() == IrqMethod::Pic && pic::slave().isr() & (1 << 7) == 0 {
+            SPURIOUS_COUNT_IRQ15.fetch_add(1, Ordering::Relaxed);
+            pic::master().ack();
+            return;
+        }
+        trigger(15);
+        eoi(15);
     }
-    trigger(15);
-    eoi(15);
 });
 
 interrupt!(lapic_timer, || {
     println!("Local apic timer interrupt");
-    lapic_eoi();
+    unsafe { lapic_eoi() };
 });
 #[cfg(feature = "profiling")]
 interrupt!(aux_timer, || {
@@ -296,11 +316,10 @@ interrupt!(aux_timer, || {
 });
 
 interrupt!(lapic_error, || {
-    log::error!(
-        "Local apic internal error: ESR={:#0x}",
+    log::error!("Local apic internal error: ESR={:#0x}", unsafe {
         local_apic::the_local_apic().esr()
-    );
-    lapic_eoi();
+    });
+    unsafe { lapic_eoi() };
 });
 
 interrupt_error!(generic_irq, |_stack, code| {
diff --git a/src/arch/x86_shared/interrupt/ipi.rs b/src/arch/x86_shared/interrupt/ipi.rs
index 359e1ceff2..f927610abd 100644
--- a/src/arch/x86_shared/interrupt/ipi.rs
+++ b/src/arch/x86_shared/interrupt/ipi.rs
@@ -1,23 +1,23 @@
 use crate::{context, device::local_apic::the_local_apic, percpu::PercpuBlock};
 
 interrupt!(wakeup, || {
-    the_local_apic().eoi();
+    unsafe { the_local_apic().eoi() };
 });
 
 interrupt!(tlb, || {
     PercpuBlock::current().maybe_handle_tlb_shootdown();
 
-    the_local_apic().eoi();
+    unsafe { the_local_apic().eoi() };
 });
 
 interrupt!(switch, || {
-    the_local_apic().eoi();
+    unsafe { the_local_apic().eoi() };
 
     let _ = context::switch();
 });
 
 interrupt!(pit, || {
-    the_local_apic().eoi();
+    unsafe { the_local_apic().eoi() };
 
     // Switch after a sufficient amount of time since the last switch.
     context::switch::tick();