summaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/main.c b/kernel/main.c
index bc1e0d3..85a85d6 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -1,9 +1,10 @@
#include <kernel/gdt.h>
#include <kernel/idt.h>
#include <kernel/mem.h>
+#include <kernel/panic.h>
#include <kernel/proc.h>
#include <kernel/tty.h>
-#include <platform/sysenter.h>
+#include <platform/asm.h>
void r3_test();
@@ -23,7 +24,6 @@ void kmain()
void r3_test() {
tty_const("ok");
- asm("cli"); // privileged instruction, should cause a GP
- tty_const(" this shouldn't happen");
- for (;;) {}
+ asm("cli");
+ panic();
}