Merge branch 'vfs-dev'

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / interrupt.S

diff --git a/lunaix-os/kernel/asm/x86/interrupt.S b/lunaix-os/kernel/asm/x86/interrupt.S
index 7c4067343b054223cd75a7aa19b1bfe3149b9c55..b4ce936b91ab5ed24a7f14dbe10a098a1a431c0f 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupt.S
+++ b/lunaix-os/kernel/asm/x86/interrupt.S
@@ -36,13 +36,16 @@
 
     isr_template LUNAIX_SYS_PANIC
     isr_template LUNAIX_SYS_CALL
+    isr_template LUNAIX_SCHED
 
     isr_template APIC_ERROR_IV
     isr_template APIC_LINT0_IV
     isr_template APIC_TIMER_IV
     isr_template APIC_SPIV_IV
     isr_template RTC_TIMER_IV
+    
     isr_template PC_KBD_IV
+    isr_template AHCI_HBA_IV
 
     interrupt_wrapper:
         /*
@@ -117,6 +120,12 @@
     soft_iret:
         movl %eax, %esp
 
+#ifdef __ASM_INTR_DIAGNOSIS
+        movl %eax, (debug_resv + 8)
+        movl 56(%esp), %eax
+        movl %eax, (debug_resv + 4)
+#endif
+
         popl %eax
         popl %ebx
         popl %ecx