From 3a85c64b806b1add77eb0c7b68d42dcb2a4507b4 Mon Sep 17 00:00:00 2001 From: Matheus Date: Sun, 25 Jun 2023 19:57:01 -0300 Subject: [PATCH] interrupt: move initial interrupt_set(true) from apic.c to idt.c --- kernel-src/arch/x86-64/apic.c | 2 -- kernel-src/arch/x86-64/idt.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel-src/arch/x86-64/apic.c b/kernel-src/arch/x86-64/apic.c index 5ebb77f3..bbf806c5 100644 --- a/kernel-src/arch/x86-64/apic.c +++ b/kernel-src/arch/x86-64/apic.c @@ -226,8 +226,6 @@ void arch_apic_initap() { if (current->acpiid == _cpu()->acpiid || current->acpiid == 0xff) writelapic(APIC_LVT_LINT0 + 0x10 * current->lint, (nmiisr->id & 0xff) | LVT_DELIVERY_NMI | (current->flags << 12)); } - - interrupt_set(true); } void arch_apic_eoi() { diff --git a/kernel-src/arch/x86-64/idt.c b/kernel-src/arch/x86-64/idt.c index 6c88b12a..b9219693 100644 --- a/kernel-src/arch/x86-64/idt.c +++ b/kernel-src/arch/x86-64/idt.c @@ -82,6 +82,7 @@ void arch_idt_reload() { interrupt_register(i, exceptisr, NULL, IPL_MAX); _cpu()->ipl = IPL_NORMAL; + interrupt_set(true); } void arch_interrupt_disable() {