summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2018-07-07 14:46:27 +0200
committerRichard Braun <rbraun@sceen.net>2018-07-07 14:47:28 +0200
commit0c0e2a02a42a8161e1b8dc1e1943fe5057ecb3a3 (patch)
treed5fa4c3160fc2c7ee910f9ff757549825f44a338 /kern
parent3a1f3702ec2d4eb8e5d8528dfbcb3bed21b623cf (diff)
x86: refactor interrupt/exception handling
This commit merges the trap module into the cpu module in order to solve interface problems caused by the degree to which those two modules are actually coupled, i.e. it just makes a lot more sense to not separate them at all. The cpu module is also internally reworked with improved object and method definitions, that clarify the double fault handling code, among other things.
Diffstat (limited to 'kern')
-rw-r--r--kern/intr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kern/intr.c b/kern/intr.c
index 541dc5cb..ac2cea6f 100644
--- a/kern/intr.c
+++ b/kern/intr.c
@@ -39,7 +39,6 @@
#include <kern/thread.h>
#include <machine/boot.h>
#include <machine/cpu.h>
-#include <machine/trap.h>
struct intr_handler {
alignas(CPU_L1_SIZE) struct list node;
@@ -79,7 +78,7 @@ struct intr_entry {
/*
* Interrupt table.
*/
-static struct intr_entry intr_table[TRAP_INTR_TABLE_SIZE];
+static struct intr_entry intr_table[CPU_INTR_TABLE_SIZE];
/*
* List of registered controllers.