git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: make pci device driver loading passive, pci bus scanner will not load them...
[lunaix-os.git]
/
lunaix-os
/
arch
/
i386
/
exceptions
/
interrupts.c
diff --git
a/lunaix-os/arch/i386/exceptions/interrupts.c
b/lunaix-os/arch/i386/exceptions/interrupts.c
index adde97346a45627b399b7597f44c58d08462ae56..a323008b977886e0609802122776d931a7e7d52d 100644
(file)
--- a/
lunaix-os/arch/i386/exceptions/interrupts.c
+++ b/
lunaix-os/arch/i386/exceptions/interrupts.c
@@
-1,7
+1,8
@@
+#include <sys/cpu.h>
+#include <sys/i386_intr.h>
#include <sys/interrupts.h>
#include <sys/x86_isa.h>
#include <sys/interrupts.h>
#include <sys/x86_isa.h>
-#include <hal/cpu.h>
#include <hal/intc.h>
#include <lunaix/isrm.h>
#include <hal/intc.h>
#include <lunaix/isrm.h>
@@
-10,9
+11,6
@@
#include <lunaix/process.h>
#include <lunaix/sched.h>
#include <lunaix/syslog.h>
#include <lunaix/process.h>
#include <lunaix/sched.h>
#include <lunaix/syslog.h>
-#include <lunaix/tty/tty.h>
-
-#include <sys/i386_intr.h>
LOG_MODULE("INTR")
LOG_MODULE("INTR")
@@
-30,11
+28,11
@@
intr_handler(isr_param* param)
goto done;
}
goto done;
}
-
kprint_panic
("INT %u: (%x) [%p: %p] Unknown",
-
execp->vector,
-
execp->err_code,
-
execp->cs,
-
execp->eip);
+
ERROR
("INT %u: (%x) [%p: %p] Unknown",
+ execp->vector,
+ execp->err_code,
+ execp->cs,
+ execp->eip);
done:
done: