diff --git a/kernel/amd64/bootmain.c b/kernel/amd64/bootmain.c
index 8141666..2604e78 100644
--- a/kernel/amd64/bootmain.c
+++ b/kernel/amd64/bootmain.c
@@ -24,6 +24,7 @@
 #include <proc/proc.h>
 #include <proc/reschedule.h>
 #include <sys/debug.h>
+#include <sys/intr.h>
 #include <sys/mm.h>
 #include <sys/smp.h>
 #include <sys/spin.h>
@@ -70,7 +71,7 @@ void bootmain(void) {
 
   lapic_init(1000);
 
-  __asm__ volatile("sti");
+  intr_enable();
 
   devices_init();
   vfs_init();
diff --git a/kernel/amd64/intr.c b/kernel/amd64/intr.c
index ee0982b..9c8db49 100644
--- a/kernel/amd64/intr.c
+++ b/kernel/amd64/intr.c
@@ -11,6 +11,7 @@
 #include <libk/string.h>
 #include <proc/reschedule.h>
 #include <sys/debug.h>
+#include <sys/intr.h>
 #include <sys/smp.h>
 #include <sys/spin.h>
 #include <syscall/syscall.h>
@@ -254,6 +255,10 @@ void intr_handler(void* stack_ptr) {
   }
 }
 
+void intr_disable(void) { __asm__ volatile("cli" ::: "memory"); }
+
+void intr_enable(void) { __asm__ volatile("sti" ::: "memory"); }
+
 /* Initialize interrupts */
 void intr_init(void) {
   pic_init();
diff --git a/kernel/amd64/sched1.c b/kernel/amd64/sched1.c
index 14919e4..12ff42d 100644
--- a/kernel/amd64/sched1.c
+++ b/kernel/amd64/sched1.c
@@ -8,13 +8,14 @@
 #include <proc/proc.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
+#include <sys/intr.h>
 #include <sys/mm.h>
 #include <sys/smp.h>
 
 void do_sched(struct proc* proc, spin_lock_t* cpu_lock) {
   uint64_t fp;
 
-  __asm__ volatile("cli");
+  intr_disable();
 
   spin_lock(&proc->lock, &fp);
 
diff --git a/kernel/amd64/smp.c b/kernel/amd64/smp.c
index 37a8d2b..f5524e5 100644
--- a/kernel/amd64/smp.c
+++ b/kernel/amd64/smp.c
@@ -14,6 +14,7 @@
 #include <proc/reschedule.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
+#include <sys/intr.h>
 #include <sys/sched.h>
 #include <sys/smp.h>
 #include <sys/syscall.h>
@@ -108,7 +109,7 @@ static void smp_bootstrap(struct limine_mp_info* mp_info) {
 
   atomic_fetch_sub(&cpu_counter, 1);
 
-  __asm__ volatile("sti");
+  intr_enable();
 
   struct reschedule_ctx rctx;
   memset(&rctx, 0, sizeof(rctx));
diff --git a/kernel/amd64/syscall.c b/kernel/amd64/syscall.c
index ec38668..649a60a 100644
--- a/kernel/amd64/syscall.c
+++ b/kernel/amd64/syscall.c
@@ -13,6 +13,7 @@
 #include <proc/reschedule.h>
 #include <status.h>
 #include <sys/debug.h>
+#include <sys/intr.h>
 #include <sys/smp.h>
 #include <syscall/syscall.h>
 #include <syscall_defs.h>
@@ -51,12 +52,12 @@ uintptr_t syscall_dispatch(void* stack_ptr) {
 
   lapic_timer_mask();
 
-  __asm__ volatile("sti");
+  intr_enable();
 
   uintptr_t r =
       func(caller, regs, &rctx, regs->rdi, regs->rsi, regs->rdx, regs->r10, regs->r8, regs->r9);
 
-  __asm__ volatile("cli");
+  intr_disable();
 
   lapic_timer_unmask();
 
diff --git a/kernel/sys/intr.h b/kernel/sys/intr.h
new file mode 100644
index 0000000..c2193a1
--- /dev/null
+++ b/kernel/sys/intr.h
@@ -0,0 +1,8 @@
+#ifndef _KERNEL_SYS_INTR_H
+#define _KERNEL_SYS_INTR_H
+
+void intr_disable(void);
+
+void intr_enable(void);
+
+#endif // _KERNEL_SYS_INTR_H