Merge branch 'vfs-dev'

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / idt.c

diff --git a/lunaix-os/kernel/asm/x86/idt.c b/lunaix-os/kernel/asm/x86/idt.c
index f453313ccd9fbf13f83b7a38b528ab9ee43b79f9..e8b9524e46c41171ef6fa66f636e07c3b210ad9e 100644 (file)
--- a/lunaix-os/kernel/asm/x86/idt.c
+++ b/lunaix-os/kernel/asm/x86/idt.c
@@ -45,24 +45,24 @@ _init_idt()
     _set_idt_intr_entry(FAULT_DIVISION_ERROR, 0x08, _asm_isr0, 0);
     _set_idt_intr_entry(FAULT_GENERAL_PROTECTION, 0x08, _asm_isr13, 0);
     _set_idt_intr_entry(FAULT_PAGE_FAULT, 0x08, _asm_isr14, 0);
+    _set_idt_intr_entry(FAULT_STACK_SEG_FAULT, 0x08, _asm_isr12, 0);
 
     _set_idt_intr_entry(APIC_ERROR_IV, 0x08, _asm_isr250, 0);
     _set_idt_intr_entry(APIC_LINT0_IV, 0x08, _asm_isr251, 0);
     _set_idt_intr_entry(APIC_SPIV_IV, 0x08, _asm_isr252, 0);
     _set_idt_intr_entry(APIC_TIMER_IV, 0x08, _asm_isr253, 0);
+
     _set_idt_intr_entry(PC_KBD_IV, 0x08, _asm_isr201, 0);
+    _set_idt_intr_entry(AHCI_HBA_IV, 0x08, _asm_isr202, 0);
 
     _set_idt_intr_entry(RTC_TIMER_IV, 0x08, _asm_isr210, 0);
 
     // system defined interrupts
     _set_idt_intr_entry(LUNAIX_SYS_PANIC, 0x08, _asm_isr32, 0);
 
-    // syscall is a trap gate (recall: trap does NOT clear IF flag upon
-    // interruption)
-    // // XXX: this should be fine, as our design of context switch support
-    // interruptible syscall We make this a non-trap entry, and enable interrupt
+    // We make this a non-trap entry, and enable interrupt
     // only when needed!
-    // FIXME: This may cause nasty concurrency bug! We should 'lockify' our
-    // code!
     _set_idt_intr_entry(LUNAIX_SYS_CALL, 0x08, _asm_isr33, 3);
+
+    _set_idt_intr_entry(LUNAIX_SCHED, 0x08, _asm_isr34, 0);
 }
\ No newline at end of file