Merge branch 'master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / x86 / exceptions / interrupts.c

diff --git a/lunaix-os/arch/x86/exceptions/interrupts.c b/lunaix-os/arch/x86/exceptions/interrupts.c
index 9d127ba5c582b0619439245a675afd7912d1e875..ceb3853150578fa1fb8cf28a3d583bc7a81eef7b 100644 (file)
--- a/lunaix-os/arch/x86/exceptions/interrupts.c
+++ b/lunaix-os/arch/x86/exceptions/interrupts.c
@@ -1,16 +1,13 @@
-#include <sys/cpu.h>
-#include <sys/int_handler.h>
-#include <sys/hart.h>
-#include "sys/x86_isa.h"
+#include <asm/hart.h>
+#include "asm/x86.h"

 
 

-#include "sys/x86_isa.h"
-
-#include <lunaix/generic/isrm.h>

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

+#include <asm/x86_isrm.h>
+

 LOG_MODULE("INTR")
 
 static inline void
 LOG_MODULE("INTR")
 
 static inline void