Merge branch 'master' into signal-dev

[lunaix-os.git] / lunaix-os / kernel / sched.c

diff --git a/lunaix-os/kernel/sched.c b/lunaix-os/kernel/sched.c
index e7bcd9a6d3fc5fb3a7e8b5577e9592f4ab8f8a1c..8e5eecbd342c511c29c2069aab8a6ec930947f19 100644 (file)
--- a/lunaix-os/kernel/sched.c
+++ b/lunaix-os/kernel/sched.c
@@ -1,12 +1,14 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/tss.h>
 #include <arch/x86/interrupts.h>
 #include <arch/x86/tss.h>

+

 #include <hal/apic.h>
 #include <hal/cpu.h>
 #include <hal/apic.h>
 #include <hal/cpu.h>

+

 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>

-
+#include <lunaix/signal.h>

 #include <lunaix/spike.h>
 #include <lunaix/status.h>
 #include <lunaix/syscall.h>
 #include <lunaix/spike.h>
 #include <lunaix/status.h>
 #include <lunaix/syscall.h>


@@ -58,6 +60,8 @@ run(struct proc_info* proc)
 
     apic_done_servicing();
 
 
     apic_done_servicing();
 

+    signal_dispatch();
+

     asm volatile("pushl %0\n"
                  "jmp soft_iret\n" ::"r"(&__current->intr_ctx)
                  : "memory");
     asm volatile("pushl %0\n"
                  "jmp soft_iret\n" ::"r"(&__current->intr_ctx)
                  : "memory");